Merge pull request #3 from openearth/master

Merge from master

Author: tomspak

.circleci/config.yml

@@ -0,0 +1,55 @@
+# Python CircleCI 2.0 configuration file
+#
+# Check https://circleci.com/docs/2.0/language-python/ for more details
+#
+version: 2
+jobs:
+  build:
+    docker:
+      # specify the version you desire here
+      # use `-browsers` prefix for selenium tests, e.g. `3.6.1-browsers`
+      - image: circleci/python:3.6.1
+
+      # Specify service dependencies here if necessary
+      # CircleCI maintains a library of pre-built images
+      # documented at https://circleci.com/docs/2.0/circleci-images/
+      # - image: circleci/postgres:9.4
+
+    working_directory: ~/repo
+
+    steps:
+      - checkout
+
+      # Download and cache dependencies
+      - restore_cache:
+          keys:
+            - v1-dependencies-{{ checksum "requirements.txt" }}
+            # fallback to using the latest cache if no exact match is found
+            - v1-dependencies-
+
+      - run:
+          name: install dependencies
+          command: |
+            python3 -m venv venv
+            . venv/bin/activate
+            pip install -r requirements.txt
+
+      - save_cache:
+          paths:
+            - ./venv
+          key: v1-dependencies-{{ checksum "requirements.txt" }}
+
+      # run tests!
+      # this example uses Django's built-in test-runner
+      # other common Python testing frameworks include pytest and nose
+      # https://pytest.org
+      # https://nose.readthedocs.io
+      - run:
+          name: run tests
+          command: |
+            . venv/bin/activate
+            nosetests
+
+      - store_artifacts:
+          path: test-reports
+          destination: test-reports

aeolis/wind.py

@@ -96,8 +96,8 @@ def interpolate(s, p, t):
         uw_d = p['wind_file'][:,2] / 180. * np.pi
 
         s['uw'][:,:] = interp_circular(t, uw_t, uw_s)
-        s['udir'][:,:] = np.arctan2(np.interp(t, uw_t, np.sin(uw_d)),
-                                    np.interp(t, uw_t, np.cos(uw_d))) * 180. / np.pi
+        s['udir'][:,:] = np.arctan2(interp_circular(t, uw_t, np.sin(uw_d)),
+                                    interp_circular(t, uw_t, np.cos(uw_d))) * 180. / np.pi
 
     s['uws'] = s['uw'] * np.cos(s['alfa'] + s['udir'] / 180. * np.pi)
     s['uwn'] = s['uw'] * np.sin(s['alfa'] + s['udir'] / 180. * np.pi)

circle.yml

@@ -10,4 +10,4 @@ configuration is listed below.
 .. literalinclude:: ../aeolis/constants.py
    :language: python
    :start-after: #: AeoLiS model default configuration
-   :end-before: #: Required model configuration parameters
+   :end-before: #: Merge initial and model state

docs/defaults.rst

@@ -0,0 +1,2 @@
+sphinxcontrib-bibtex
+sphinxcontrib-napoleon

docs/requirements.txt

@@ -1,6 +1,4 @@
 netCDF4==1.4.1
 coverage
 codecov
-sphinxcontrib-bibtex
-sphinxcontrib-napoleon==0.2.8
-sphinx-rtd-theme
+