Skip to content

Commit b40e1a3

Browse files
gforsythgforsyth
authored
Merge pull request barbagroup#46 from barbagroup/small_fixes
Fix comments and some renaming for JOSE submission
2 parents 3fa309f + 6774be9 commit b40e1a3

22 files changed

+757
-80007
lines changed

‎lessons/00_Quick_Python_Intro.ipynb‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11
{
22
"cells": [
3-
{
4-
"cell_type": "markdown",
5-
"metadata": {},
6-
"source": [
7-
"#### Version 0.4 -- August 2015"
8-
]
9-
},
103
{
114
"cell_type": "markdown",
125
"metadata": {},
@@ -18,7 +11,7 @@
1811
"cell_type": "markdown",
1912
"metadata": {},
2013
"source": [
21-
"Hello! This is a quick intro to programming in Python to help you hit the ground running with the _12 Steps to Navier-Stokes_. \n",
14+
"Hello! This is a quick intro to programming in Python to help you hit the ground running with the _12 Steps to Navier–Stokes_. \n",
2215
"\n",
2316
"There are two ways to enjoy these lessons with Python:\n",
2417
"\n",
@@ -732,7 +725,7 @@
732725
"cell_type": "markdown",
733726
"metadata": {},
734727
"source": [
735-
"There are a lot of resources online to learn more about using NumPy and other libraries. Just for kicks, here we use IPython's feature for embedding videos to point you to a short video on YouTube on using NumPy arrays."
728+
"There are a lot of resources online to learn more about using NumPy and other libraries. Just for kicks, here we use Jupyter's feature for embedding videos to point you to a short video on YouTube on using NumPy arrays."
736729
]
737730
},
738731
{

‎lessons/01_Step_1.ipynb‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,7 @@
1818
"cell_type": "markdown",
1919
"metadata": {},
2020
"source": [
21-
"##### Version 0.12 (August 2015)"
22-
]
23-
},
24-
{
25-
"cell_type": "markdown",
26-
"metadata": {},
27-
"source": [
28-
"12 steps to Navier-Stokes\n",
21+
"12 steps to Navier–Stokes\n",
2922
"======\n",
3023
"***"
3124
]
@@ -34,13 +27,13 @@
3427
"cell_type": "markdown",
3528
"metadata": {},
3629
"source": [
37-
"Hello! Welcome to the **12 steps to Navier-Stokes**. This is a practical module that is used in the beginning of an interactive Computational Fluid Dynamics (CFD) course taught by [Prof. Lorena Barba](http://lorenabarba.com) since Spring 2009 at Boston University. The course assumes only basic programming knowledge (in any language) and of course some foundation in partial differential equations and fluid mechanics. The practical module was inspired by the ideas of Dr. Rio Yokota, who was a post-doc in Barba's lab, and has been refined by Prof. Barba and her students over several semesters teaching the course. The course is taught entirely using Python and students who don't know Python just learn as we work through the module.\n",
30+
"Hello! Welcome to the **12 steps to Navier–Stokes**. This is a practical module that is used in the beginning of an interactive Computational Fluid Dynamics (CFD) course taught by [Prof. Lorena Barba](http://lorenabarba.com) since Spring 2009 at Boston University. The course assumes only basic programming knowledge (in any language) and of course some foundation in partial differential equations and fluid mechanics. The practical module was inspired by the ideas of Dr. Rio Yokota, who was a post-doc in Barba's lab, and has been refined by Prof. Barba and her students over several semesters teaching the course. The course is taught entirely using Python and students who don't know Python just learn as we work through the module.\n",
3831
"\n",
39-
"This [IPython notebook](http://ipython.org/ipython-doc/stable/interactive/htmlnotebook.html) will lead you through the first step of programming your own Navier-Stokes solver in Python from the ground up. We're going to dive right in. Don't worry if you don't understand everything that's happening at first, we'll cover it in detail as we move forward and you can support your learning with the videos of [Prof. Barba's lectures on YouTube](http://www.youtube.com/playlist?list=PL30F4C5ABCE62CB61).\n",
32+
"This [Jupyter notebook](https://jupyter-notebook.readthedocs.io/en/stable/) will lead you through the first step of programming your own Navier–Stokes solver in Python from the ground up. We're going to dive right in. Don't worry if you don't understand everything that's happening at first, we'll cover it in detail as we move forward and you can support your learning with the videos of [Prof. Barba's lectures on YouTube](http://www.youtube.com/playlist?list=PL30F4C5ABCE62CB61).\n",
4033
"\n",
41-
"For best results, after you follow this notebook, prepare your own code for Step 1, either as a Python script or in a clean IPython notebook.\n",
34+
"For best results, after you follow this notebook, prepare your own code for Step 1, either as a Python script or in a clean Jupyter notebook.\n",
4235
"\n",
43-
"To execute this Notebook, we assume you have invoked the notebook server using: `ipython notebook`."
36+
"To execute this Notebook, we assume you have invoked the notebook server using: `jupyter notebook`."
4437
]
4538
},
4639
{
@@ -413,7 +406,7 @@
413406
"cell_type": "markdown",
414407
"metadata": {},
415408
"source": [
416-
"**Remember** to rewrite Step 1 as a fresh Python script or in *your own* IPython notebook and then experiment by changing the discretization parameters. Once you have done this, you will be ready for [Step 2](./02_Step_2.ipynb).\n",
409+
"**Remember** to rewrite Step 1 as a fresh Python script or in *your own* Jupyter notebook and then experiment by changing the discretization parameters. Once you have done this, you will be ready for [Step 2](./02_Step_2.ipynb).\n",
417410
"\n",
418411
"\n",
419412
"***"

‎lessons/02_Step_2.ipynb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"cell_type": "markdown",
1919
"metadata": {},
2020
"source": [
21-
"12 steps to Navier-Stokes\n",
21+
"12 steps to Navier–Stokes\n",
2222
"======\n",
2323
"***"
2424
]
@@ -27,7 +27,7 @@
2727
"cell_type": "markdown",
2828
"metadata": {},
2929
"source": [
30-
"This IPython notebook continues the presentation of the **12 steps to Navier-Stokes**, the practical module taught in the interactive CFD class of [Prof. Lorena Barba](http://lorenabarba.com). You should have completed [Step 1](./01_Step_1.ipynb) before continuing, having written your own Python script or notebook and having experimented with varying the parameters of the discretization and observing what happens.\n"
30+
"This Jupyter notebook continues the presentation of the **12 steps to Navier–Stokes**, the practical module taught in the interactive CFD class of [Prof. Lorena Barba](http://lorenabarba.com). You should have completed [Step 1](./01_Step_1.ipynb) before continuing, having written your own Python script or notebook and having experimented with varying the parameters of the discretization and observing what happens.\n"
3131
]
3232
},
3333
{
@@ -71,8 +71,8 @@
7171
},
7272
"outputs": [],
7373
"source": [
74-
"import numpy #we're importing numpy and calling it np locally\n",
75-
"from matplotlib import pyplot #and our 2D plotting library, calling it plt\n",
74+
"import numpy # we're importing numpy \n",
75+
"from matplotlib import pyplot # and our 2D plotting library\n",
7676
"%matplotlib inline\n",
7777
"\n",
7878
"\n",

‎lessons/03_CFL_Condition.ipynb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"cell_type": "markdown",
1919
"metadata": {},
2020
"source": [
21-
"12 steps to Navier-Stokes\n",
21+
"12 steps to Navier–Stokes\n",
2222
"=====\n",
2323
"***"
2424
]

‎lessons/04_Step_3.ipynb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"cell_type": "markdown",
1919
"metadata": {},
2020
"source": [
21-
"12 steps to Navier-Stokes\n",
21+
"12 steps to Navier–Stokes\n",
2222
"======\n",
2323
"***"
2424
]
@@ -27,7 +27,7 @@
2727
"cell_type": "markdown",
2828
"metadata": {},
2929
"source": [
30-
"You should have completed Steps [1](./01_Step_1.ipynb) and [2](./02_Step_2.ipynb) before continuing. This IPython notebook continues the presentation of the **12 steps to Navier-Stokes**, the practical module taught in the interactive CFD class of [Prof. Lorena Barba](http://lorenabarba.com). "
30+
"You should have completed Steps [1](./01_Step_1.ipynb) and [2](./02_Step_2.ipynb) before continuing. This Jupyter notebook continues the presentation of the **12 steps to Navier–Stokes**, the practical module taught in the interactive CFD class of [Prof. Lorena Barba](http://lorenabarba.com). "
3131
]
3232
},
3333
{

0 commit comments

Comments
 (0)