Skip to content

Commit 62664da

Browse files
authored
Merge pull request #164 from UW-Hydro/develop
Develop
2 parents 70f1a28 + 3fa2dbe commit 62664da

File tree

97 files changed

+11982
-551
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+11982
-551
lines changed

binder/apt.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
wget
2+
software-properties-common
3+
ca-certificates

binder/environment.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: pysumma
2+
channels:
3+
- conda-forge
4+
dependencies:
5+
- python>=3.7
6+
- xarray>=0.15.0
7+
- pandas
8+
- netcdf4>=1.2.5
9+
- numpy>=1.11.2
10+
- dask
11+
- distributed
12+
- toolz
13+
- pytest
14+
- fiona
15+
- cartopy
16+
- shapely
17+
- seaborn
18+
- matplotlib
19+
- geopandas
20+
- pandas
21+
- jupyter
22+
- pip
23+
- summa>=3.0.3
24+
- pysumma>=3.0.3
25+
- mizuroute
26+
- pip:
27+
- hs_restclient
28+
- nbsphinx

binder/postbuild

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
source activate pysumma
2+
python setup.py develop
3+
python -m ipykernel install --user --name pysumma

docs/_static/wide_theme.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.wy-nav-content {
2+
max-width: 1200px !important;
3+
}

docs/api.rst

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ API reference
88
This page provides an auto-generated summary of pysumma's API. For more details
99
and examples, refer to the main documentation.
1010

11+
Interfaces to running SUMMA
12+
+++++++++++++++++++++++++++
13+
1114
Simulation
1215
==========
1316
.. autoclass:: pysumma.Simulation
@@ -20,8 +23,32 @@ Ensemble
2023
:members:
2124

2225
Distributed
23-
=======
26+
===========
2427

2528
.. autoclass:: pysumma.Distributed
2629
:members:
2730

31+
Ostrich
32+
=======
33+
34+
.. autoclass:: pysumma.calibration.Ostrich
35+
:members:
36+
37+
Plotting utilities
38+
++++++++++++++++++
39+
40+
.. automodule:: pysumma.plotting.layers
41+
:members:
42+
43+
.. automodule:: pysumma.plotting.hovmoller
44+
:members:
45+
46+
.. automodule:: pysumma.plotting.spatial
47+
:members: spatial
48+
49+
50+
Evaluation utilities
51+
++++++++++++++++++++
52+
53+
.. automodule:: pysumma.evaluation
54+
:members:

docs/conf.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
sys.path.insert(0, os.path.abspath('.'))
2323
sys.path.insert(0, os.path.abspath('../'))
24+
sys.path.insert(0, os.path.abspath('../tutorial'))
2425

2526
# -- General configuration ------------------------------------------------
2627

@@ -36,7 +37,10 @@
3637
'sphinx.ext.mathjax',
3738
'sphinx.ext.viewcode',
3839
'sphinx.ext.napoleon',
39-
'sphinx.ext.autosummary']
40+
'sphinx.ext.autosummary',
41+
'nbsphinx',
42+
'nbsphinx_multilink'
43+
]
4044

4145
extlinks = {'issue': ('https://github.com/UW-Hydro/pysumma/issues/%s', 'GH'),
4246
'pull': ('https://github.com/UW-Hydro/pysumma/pull/%s', 'PR'),
@@ -163,6 +167,9 @@
163167
# dir menu entry, description, category)
164168
texinfo_documents = [
165169
(master_doc, 'pysumma', 'pysumma Documentation',
166-
author, 'pysumma ', 'One line description of project.',
167-
'Miscellaneous'),
170+
author, 'pysumma ', 'A python package for interfacing with SUMMA',
171+
'Hydrology'),
168172
]
173+
174+
def setup(app):
175+
app.add_css_file('wide_theme.css')

docs/index.rst

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ it will also install a compatible version of SUMMA.
2222

2323
To install via ``conda`` use:
2424

25-
::
25+
::
2626

2727
conda install -c conda-forge pysumma
2828

@@ -78,21 +78,12 @@ Bugs
7878
will help you make the pull request if you are new to git
7979
(just ask on the issue).
8080

81-
How to run pySUMMA on HydroShare
82-
================================
83-
(Link YouTube: https://www.youtube.com/watch?v=pL-LNd474Tw)
84-
1) log in HydoShare(https://www.hydroshare.org)
85-
2) Start CUAHSI JupyterHub from APPS menu on HydroShare(https://www.hydroshare.org/apps/)
86-
3) Open "Welcome.ipynb" to download pySUMMA resources from HydroShare
87-
- run the code "1.How to connect with HydroShare"
88-
- change the code from "resid = os.environ['HS_RES_ID']" to "resid = 'c1bb4a12bff44bf08c5958cba7947348'".
89-
4) You can see the list of Jupyter Notebooks and click one of Jupyter Notebook.
90-
5) Run one of Jupyter Notebooks.
91-
9281
Sitemap
9382
=======
9483
.. toctree::
9584
:maxdepth: 3
9685

97-
api
9886
configuration
87+
tutorials
88+
plotting
89+
api

docs/plotting.ipynb

Lines changed: 393 additions & 0 deletions
Large diffs are not rendered by default.

docs/requirements.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Sphinx>=3.0
2+
nbconvert==5.6.1
3+
nbsphinx-link
4+
nbsphinx-multilink

docs/tutorials.nblink

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
2+
[
3+
{ "path": "../tutorial/1_introduction_to_pysumma.ipynb" },
4+
{ "path": "../tutorial/2_building_ensembles.ipynb" },
5+
{ "path": "../tutorial/3_parallelizing_distributed_simulations.ipynb" },
6+
{ "path": "../tutorial/4_simple_calibration.ipynb" }
7+
]

0 commit comments

Comments
 (0)