Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@faph
faph committed Aug 26, 2015
2 parents d622ee3 + d56b199 commit 9dddea0
Show file tree
Hide file tree
Showing 10 changed files with 79 additions and 300 deletions.
30 changes: 16 additions & 14 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,24 @@
language: python
python:
- 3.3
- 3.4
- 3.3
- 3.4

sudo: false

before_install:
- wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh
- chmod +x miniconda.sh
- ./miniconda.sh -b
- export PATH=/home/travis/miniconda/bin:$PATH
- conda update --yes conda
- conda config --add channels https://conda.binstar.org/openhydrology
# The next couple lines fix a crash with multiprocessing on Travis and are not specific to using Miniconda
- sudo rm -rf /dev/shm
- sudo ln -s /run/shm /dev/shm
- wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
- bash miniconda.sh -b -p $HOME/miniconda
- export PATH="$HOME/miniconda/bin:$PATH"
- hash -r
- conda config --set always_yes yes --set changeps1 no
- conda update -q conda
- conda info -a
- conda config --add channels http://conda.anaconda.org/openhydrology
- conda create -q -n pyenv python=$TRAVIS_PYTHON_VERSION nose appdirs=1.4 Jinja2=2.8 floodestimation=0.4.2
- source activate pyenv

install:
- conda install --yes python=$TRAVIS_PYTHON_VERSION nose appdirs=1.4 Jinja2=2.7 floodestimation=0.4.0
- python setup.py install
- python setup.py install

script:
- nosetests
- nosetests
5 changes: 5 additions & 0 deletions CHANGELOG.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
version 0.5.5 (2015-08-26)
--------------------------
- Upgrade to floodestimation library v0.4.2
- Upgrade various other dependencies

version 0.5.3 (2015-02-27)
--------------------------
- Use version 3.9.1 of miniconda in win installer
Expand Down
40 changes: 20 additions & 20 deletions ...002.Flood estimation report.2015-02-25.md → ...002.Flood estimation report.2015-08-26.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Flood Estimation Report

Date: 25/02/2015
Date: 26/08/2015

## Input data

Expand All @@ -26,10 +26,10 @@ FARL | 0.824  | SAAR4170 | 951      | |

### National River Flow Archive (NRFA) data

Source: http://www.ceh.ac.uk/data/nrfa/peak_flow/WINFAP-FEH_v3.3.4.zip
Source: http://nrfaapps.ceh.ac.uk/peak_flow/WINFAP-FEH_v3.3.4.zip
Version: 3.3.4
Published: August 2014
Retrieved: 24/02/2015
Retrieved: 26/08/2015

## Median annual flood (QMED)

Expand Down Expand Up @@ -66,40 +66,40 @@ Analysis type: Pooled catchments analysis (ungauged)

Donor river | Donor location | Sim. dist. | Rec. length | L-var. | Weight | L-skew | Weight
:-------------------|:-------------------------------|-----------:|------------:|-------:|-------:|-------:|------:
Thurso | Halkirk | 0.33 | 35 | 0.173 | 0.100 | 0.102 | 0.086
Brora | Bruachrobie | 0.71 | 14 | 0.149 | 0.065 | 0.101 | 0.049
Helmsdale | Kilphedir | 0.75 | 32 | 0.119 | 0.076 | 0.117 | 0.071
Naver | Apigill | 0.82 | 28 | 0.169 | 0.072 | 0.126 | 0.067
Nairn | Firhall | 0.85 | 25 | 0.312 | 0.070 | 0.325 | 0.064
Thurso | Halkirk | 0.33 | 34 | 0.173 | 0.100 | 0.102 | 0.086
Brora | Bruachrobie | 0.71 | 13 | 0.149 | 0.063 | 0.101 | 0.047
Helmsdale | Kilphedir | 0.75 | 31 | 0.119 | 0.076 | 0.117 | 0.071
Naver | Apigill | 0.82 | 28 | 0.169 | 0.073 | 0.126 | 0.068
Nairn | Firhall | 0.85 | 25 | 0.312 | 0.071 | 0.325 | 0.065
Windrush | Newbridge | 0.99 | 62 | 0.194 | 0.074 | 0.241 | 0.082
Isla | Wester Cardean | 1.00 | 23 | 0.154 | 0.066 | 0.077 | 0.062
Itchen | Highbridge & Allbrook Total | 1.05 | 54 | 0.146 | 0.071 | 0.138 | 0.079
Lugg | Butts Bridge | 1.09 | 41 | 0.162 | 0.069 | 0.046 | 0.074
Derwent | Chatsworth | 1.11 | 37 | 0.248 | 0.068 | 0.211 | 0.072
Wreake | Syston Mill | 1.13 | 43 | 0.307 | 0.068 | 0.393 | 0.075
Isla | Wester Cardean | 1.00 | 22 | 0.154 | 0.065 | 0.077 | 0.061
Itchen | Highbridge & Allbrook Total | 1.05 | 54 | 0.146 | 0.072 | 0.138 | 0.080
Lugg | Butts Bridge | 1.09 | 41 | 0.162 | 0.069 | 0.046 | 0.075
Derwent | Chatsworth | 1.11 | 37 | 0.248 | 0.068 | 0.211 | 0.073
Wreake | Syston Mill | 1.13 | 42 | 0.307 | 0.068 | 0.393 | 0.075
Evenlode | Cassington Mill | 1.14 | 42 | 0.225 | 0.068 | 0.133 | 0.075
Irvine | Shewalton | 1.14 | 30 | 0.143 | 0.065 | 0.206 | 0.068
Wylye | South Newton | 1.14 | 41 | 0.254 | 0.068 | 0.137 | 0.074
Total/weighted avg. | | | 507 | 0.196 | 1.000 | 0.169 | 1.000
Wylye | South Newton | 1.14 | 41 | 0.254 | 0.068 | 0.137 | 0.075
Total/weighted avg. | | | 502 | 0.196 | 1.000 | 0.169 | 1.000

L-var., urban: 0.191
L-skew, urban: 0.175
L-var., urban: 0.192
L-skew, urban: 0.176

### Flood frequency curve

Distribution: GLO
Parameters: 1.000, 0.182, -0.175
Parameters: 1.000, 0.182, -0.176

AEP (%) | Growth factor | Flow (m³/s)
-------:|--------------:|-----------:
50.0 | 1.00 | 52  
20.0 | 1.29 | 67  
10.0 | 1.49 | 77  
5.0 | 1.70 | 88  
3.3 | 1.83 | 95  
3.3 | 1.84 | 95  
2.0 | 2.02 | 100  
1.3 | 2.17 | 110  
1.0 | 2.28 | 120  
1.0 | 2.29 | 120  
0.5 | 2.59 | 130  
0.2 | 3.05 | 160  
0.1 | 3.45 | 180  
Expand Down
18 changes: 9 additions & 9 deletions ...017.Flood estimation report.2015-02-25.md → ...017.Flood estimation report.2015-08-26.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Flood Estimation Report

Date: 25/02/2015
Date: 26/08/2015

## Input data

Expand Down Expand Up @@ -65,10 +65,10 @@ FARL | 0.994  | SAAR4170 | 604      | |

### National River Flow Archive (NRFA) data

Source: http://www.ceh.ac.uk/data/nrfa/peak_flow/WINFAP-FEH_v3.3.4.zip
Source: http://nrfaapps.ceh.ac.uk/peak_flow/WINFAP-FEH_v3.3.4.zip
Version: 3.3.4
Published: August 2014
Retrieved: 24/02/2015
Retrieved: 26/08/2015

## Median annual flood (QMED)

Expand All @@ -87,17 +87,17 @@ Donor river | Donor location | Sim. dist. | Rec. length
:-------------------|:-------------------------------|-----------:|------------:|-------:|-------:|-------:|------:
Blackwater | Stisted | 0.00 | 34 | 0.223 | 0.663 | -0.091 | 0.188
Chelmer | Felsted | 0.12 | 42 | 0.332 | 0.040 | 0.216 | 0.105
Brett | Hadleigh | 0.17 | 48 | 0.298 | 0.037 | 0.153 | 0.094
Brett | Hadleigh | 0.17 | 48 | 0.298 | 0.038 | 0.153 | 0.094
Cam | Chesterford | 0.20 | 43 | 0.248 | 0.035 | -0.108 | 0.084
Rib | Wadesmill | 0.23 | 53 | 0.313 | 0.035 | 0.163 | 0.085
Tove | Cappenham Bridge | 0.28 | 49 | 0.270 | 0.033 | 0.183 | 0.077
Gipping | Stowmarket | 0.36 | 48 | 0.296 | 0.030 | 0.108 | 0.069
Tyne | Spilmersford | 0.54 | 45 | 0.406 | 0.026 | 0.245 | 0.062
Tove | Cappenham Bridge | 0.28 | 48 | 0.270 | 0.033 | 0.183 | 0.076
Gipping | Stowmarket | 0.36 | 46 | 0.296 | 0.030 | 0.108 | 0.069
Tyne | Spilmersford | 0.54 | 44 | 0.406 | 0.026 | 0.245 | 0.061
Blackadder Water | Mouth Bridge | 0.57 | 32 | 0.321 | 0.025 | 0.268 | 0.055
Bourne | Laverstock | 0.60 | 41 | 0.323 | 0.025 | 0.302 | 0.059
Enborne | Brimpton | 0.60 | 45 | 0.204 | 0.025 | 0.148 | 0.061
Bain | Fulsby Lock | 0.61 | 50 | 0.294 | 0.025 | 0.087 | 0.062
Total/weighted avg. | | | 530 | 0.249 | 1.000 | 0.109 | 1.000
Bain | Fulsby Lock | 0.61 | 50 | 0.294 | 0.026 | 0.087 | 0.062
Total/weighted avg. | | | 526 | 0.249 | 1.000 | 0.108 | 1.000

L-var., urban: 0.245
L-skew, urban: 0.113
Expand Down
2 changes: 1 addition & 1 deletion binst.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# Parse version and build number from VERSION file
full_version = open('VERSION').read().split('-')
version = full_version[0]
conda_channel = 'https://conda.binstar.org/openhydrology'
conda_channel = 'https://conda.anaconda.org/openhydrology'

if len(full_version) == 1: # Public release version
number = 0
Expand Down
2 changes: 1 addition & 1 deletion conda-recipe/.binstar.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ engine:

before_script:
- conda update --name=root conda conda-build
- conda config --add channels https://conda.binstar.org/openhydrology
- conda config --add channels https://conda.anaconda.org/openhydrology

script:
- conda build .
15 changes: 11 additions & 4 deletions conda-recipe/meta.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,27 @@ requirements:
- python
- setuptools
- appdirs 1.4*
- jinja2 2.7*
- floodestimation 0.4.0
- jinja2 2.8*
- floodestimation 0.4.2

run:
- python
- appdirs 1.4*
- jinja2 2.7*
- floodestimation 0.4.0
- jinja2 2.8*
- floodestimation 0.4.2

test:
# Python imports
imports:
- autostatistical

app:
entry: autostatistical
type: desk
icon:
own_environment: true
summary: Fully automated flood estimation for UK catchments

about:
home: https://github.com/OpenHydrology/OH-Auto-Statistical
license: GPLv3
Expand Down

0 comments on commit 9dddea0

Please sign in to comment.