From d2bca46693c865c5db07aa52c0e4b1f36f7ddea7 Mon Sep 17 00:00:00 2001 From: Naruu Date: Tue, 2 Jul 2019 06:01:59 -0400 Subject: [PATCH 1/3] Correct the formula by changing u_{i,j} to u_{i,j}^n --- lessons/08_Step_6.ipynb | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/lessons/08_Step_6.ipynb b/lessons/08_Step_6.ipynb index 59559a8b..a0ae204b 100644 --- a/lessons/08_Step_6.ipynb +++ b/lessons/08_Step_6.ipynb @@ -69,9 +69,9 @@ "source": [ "Rearranging both equations, we solve for $u_{i,j}^{n+1}$ and $v_{i,j}^{n+1}$, respectively. Note that these equations are also coupled. \n", "\n", - "$$u_{i,j}^{n+1} = u_{i,j}^n - u_{i,j} \\frac{\\Delta t}{\\Delta x} (u_{i,j}^n-u_{i-1,j}^n) - v_{i,j}^n \\frac{\\Delta t}{\\Delta y} (u_{i,j}^n-u_{i,j-1}^n)$$\n", + "$$u_{i,j}^{n+1} = u_{i,j}^n - u_{i,j}^n \\frac{\\Delta t}{\\Delta x} (u_{i,j}^n-u_{i-1,j}^n) - v_{i,j}^n \\frac{\\Delta t}{\\Delta y} (u_{i,j}^n-u_{i,j-1}^n)$$\n", "\n", - "$$v_{i,j}^{n+1} = v_{i,j}^n - u_{i,j} \\frac{\\Delta t}{\\Delta x} (v_{i,j}^n-v_{i-1,j}^n) - v_{i,j}^n \\frac{\\Delta t}{\\Delta y} (v_{i,j}^n-v_{i,j-1}^n)$$" + "$$v_{i,j}^{n+1} = v_{i,j}^n - u_{i,j}^n \\frac{\\Delta t}{\\Delta x} (v_{i,j}^n-v_{i-1,j}^n) - v_{i,j}^n \\frac{\\Delta t}{\\Delta y} (v_{i,j}^n-v_{i,j-1}^n)$$" ] }, { @@ -160,9 +160,7 @@ { "cell_type": "code", "execution_count": 3, - "metadata": { - "collapsed": false - }, + "metadata": {}, "outputs": [ { "data": { @@ -188,9 +186,7 @@ { "cell_type": "code", "execution_count": 4, - "metadata": { - "collapsed": false - }, + "metadata": {}, "outputs": [], "source": [ "for n in range(nt + 1): ##loop across number of time steps\n", @@ -217,9 +213,7 @@ { "cell_type": "code", "execution_count": 5, - "metadata": { - "collapsed": false - }, + "metadata": {}, "outputs": [ { "data": { @@ -245,9 +239,7 @@ { "cell_type": "code", "execution_count": 6, - "metadata": { - "collapsed": false - }, + "metadata": {}, "outputs": [ { "data": { @@ -286,9 +278,7 @@ { "cell_type": "code", "execution_count": 7, - "metadata": { - "collapsed": false - }, + "metadata": {}, "outputs": [ { "data": { @@ -321,9 +311,7 @@ { "cell_type": "code", "execution_count": 8, - "metadata": { - "collapsed": false - }, + "metadata": {}, "outputs": [ { "data": { @@ -453,9 +441,9 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.5.2" + "version": "3.6.4" } }, "nbformat": 4, - "nbformat_minor": 0 + "nbformat_minor": 1 } From b836f7be1221b43c58b4405d0c8421b13c9d9ca7 Mon Sep 17 00:00:00 2001 From: Naruu Date: Tue, 2 Jul 2019 06:03:26 -0400 Subject: [PATCH 2/3] Remove redundant variable c from for loop --- lessons/08_Step_6.ipynb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lessons/08_Step_6.ipynb b/lessons/08_Step_6.ipynb index a0ae204b..aaa9e055 100644 --- a/lessons/08_Step_6.ipynb +++ b/lessons/08_Step_6.ipynb @@ -193,11 +193,11 @@ " un = u.copy()\n", " vn = v.copy()\n", " u[1:, 1:] = (un[1:, 1:] - \n", - " (un[1:, 1:] * c * dt / dx * (un[1:, 1:] - un[1:, :-1])) -\n", - " vn[1:, 1:] * c * dt / dy * (un[1:, 1:] - un[:-1, 1:]))\n", + " (un[1:, 1:] * dt / dx * (un[1:, 1:] - un[1:, :-1])) -\n", + " vn[1:, 1:] * dt / dy * (un[1:, 1:] - un[:-1, 1:]))\n", " v[1:, 1:] = (vn[1:, 1:] -\n", - " (un[1:, 1:] * c * dt / dx * (vn[1:, 1:] - vn[1:, :-1])) -\n", - " vn[1:, 1:] * c * dt / dy * (vn[1:, 1:] - vn[:-1, 1:]))\n", + " (un[1:, 1:] * dt / dx * (vn[1:, 1:] - vn[1:, :-1])) -\n", + " vn[1:, 1:] * dt / dy * (vn[1:, 1:] - vn[:-1, 1:]))\n", " \n", " u[0, :] = 1\n", " u[-1, :] = 1\n", From 3161112c83e867fb7c610bd7d45ef7335618021f Mon Sep 17 00:00:00 2001 From: Naruu Date: Thu, 29 Aug 2019 21:09:17 +0900 Subject: [PATCH 3/3] Update 05_Step_4.ipynb fix typo --- lessons/05_Step_4.ipynb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lessons/05_Step_4.ipynb b/lessons/05_Step_4.ipynb index ec8e076f..038cdb65 100644 --- a/lessons/05_Step_4.ipynb +++ b/lessons/05_Step_4.ipynb @@ -86,7 +86,7 @@ "\n", "$$u(0) = u(2\\pi)$$\n", "\n", - "This is called a *periodic* boundary condition. Pay attention! This will cause you a bit of headache if you don't tread carefully." + "This is called a *periodic* boundary condition. Pay attention! This will cause you a bit of headache if you don't read carefully." ] }, {