Skip to content

Commit

Permalink
Fixed typos
Browse files Browse the repository at this point in the history
  • Loading branch information
DamienIrving committed Jun 21, 2019
1 parent 95d6ffe commit 5e78d42
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
3 changes: 2 additions & 1 deletion _episodes/01-conda.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ to make the types of analysis we do faster and more efficient.
To learn more about the PyAOS "stack" shown in the diagram below
(i.e. the collection of libraries that are typically used for
data analysis and visualisation in the atmosphere and ocean sciences),
check out [this post](https://drclimate.wordpress.com/2016/10/04/the-weatherclimate-python-stack/).
check out [PyAOS stack](https://carpentrieslab.github.io/python-aos-lesson/stack/index.html)
page in the extras tab of the menu above.

![PyAOS stack](../fig/01-pyaos-stack.png)

Expand Down
8 changes: 4 additions & 4 deletions _extras/stack.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ title: PyAOS stack
---

It would be an understatement to say that Python has exploded onto the data science scene in recent years.
PyCon and SciPy conferences are held somewhere in the world every few months now,
PyCon and SciPy conferences are held somewhere around the world every few months,
at which loads of new and/or improved data science libraries are showcased to the community
(check out [pyvideo.org](pyvideo.org) for conference recordings).
The ongoing rapid development of new libraries means that data scientists are (hopefully)
Expand All @@ -19,7 +19,7 @@ The focus is on libraries that are widely used and that have good (and likely lo

## Core

The dashed box in the diagram represents the core of the stack, so let’s start this tour there.
The dashed box in the diagram represents the core of the stack, so let’s start our tour there.
The default library for dealing with numerical arrays in Python is [NumPy](http://www.numpy.org/).
It has a bunch of built in functions for reading and writing common data formats like .csv,
but if your data is stored in netCDF format then the default library for getting data
Expand All @@ -35,7 +35,7 @@ the [SciPy](https://www.scipy.org/scipylib/index.html) library is the default.
If you’re dealing with a particularly large dataset,
you may get memory errors (and/or slow performance)
when trying to read and process your data.
[Dask[(https://dask.org/) works with the existing Python ecosystem (i.e. NumPy, SciPy etc)
[Dask](https://dask.org/) works with the existing Python ecosystem (i.e. NumPy, SciPy etc)
to scale your analysis to multi-core machines and/or distributed clusters
(i.e. parallel processing).

Expand Down Expand Up @@ -117,7 +117,7 @@ The VCDAT application also now runs as a JupyterLab extension, which is an excit
> ## How to choose
>
> In terms of choosing between xarray and Iris,
> some people like the slightly more atmosphere/ocean-centric experience offered by Iris,
> some people like the slightly more AOS-centric experience offered by Iris,
> while others don’t like the restrictions that places on their work
> and prefer the generic xarray experience
> (e.g. to use Iris your netCDF data files have to be CF compliant or close to it).
Expand Down

0 comments on commit 5e78d42

Please sign in to comment.