Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ before_install:
fi
- |
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
curl https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh > $HOME/miniconda.sh
curl https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh > $HOME/miniconda.sh
else
curl https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh > $HOME/miniconda.sh
curl https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh > $HOME/miniconda.sh
fi
- bash $HOME/miniconda.sh -b -p $HOME/anaconda
- export PATH="$HOME/anaconda/bin:$PATH"
Expand Down
4 changes: 2 additions & 2 deletions heat/heat.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def solve_2d(temp, spacing, out=None, alpha=1.0, time_step=1.0):
>>> from heat import solve_2d
>>> z0 = np.zeros((3, 3))
>>> z0[1:-1, 1:-1] = 1.
>>> solve_2d(z0, (1., 1.), alpha=.125)
>>> solve_2d(z0, (1., 1.), alpha=.25)
array([[0. , 0. , 0. ],
[0. , 0.5, 0. ],
[0. , 0. , 0. ]])
Expand All @@ -41,7 +41,7 @@ def solve_2d(temp, spacing, out=None, alpha=1.0, time_step=1.0):
np.array([[0.0, dy2, 0.0], [dx2, -2.0 * (dx2 + dy2), dx2], [0.0, dy2, 0.0]])
* alpha
* time_step
/ (dx2 * dy2)
/ (2.0 * (dx2 * dy2))
)

if out is None:
Expand Down