diff --git "a/01_Introduction/\020\327?\001" "b/01_Introduction/\020\327?\001"
new file mode 100644
index 0000000..e69de29
diff --git a/01_Introduction/.ipynb_checkpoints/01-Introduction-checkpoint.ipynb b/01_Introduction/.ipynb_checkpoints/01-Introduction-checkpoint.ipynb
index b543fee..ccd5cd7 100644
--- a/01_Introduction/.ipynb_checkpoints/01-Introduction-checkpoint.ipynb
+++ b/01_Introduction/.ipynb_checkpoints/01-Introduction-checkpoint.ipynb
@@ -33,7 +33,7 @@
},
{
"cell_type": "code",
- "execution_count": 1,
+ "execution_count": 13,
"metadata": {
"collapsed": true,
"slideshow": {
@@ -60,7 +60,7 @@
},
{
"cell_type": "code",
- "execution_count": 18,
+ "execution_count": 4,
"metadata": {
"collapsed": false,
"slideshow": {
@@ -93,7 +93,7 @@
},
{
"cell_type": "code",
- "execution_count": 19,
+ "execution_count": 7,
"metadata": {
"collapsed": false,
"slideshow": {
@@ -149,7 +149,7 @@
},
{
"cell_type": "code",
- "execution_count": 6,
+ "execution_count": 8,
"metadata": {
"collapsed": false,
"slideshow": {
@@ -239,7 +239,7 @@
},
{
"cell_type": "code",
- "execution_count": 14,
+ "execution_count": 11,
"metadata": {
"collapsed": true,
"slideshow": {
@@ -305,98 +305,108 @@
"\n",
"\n",
"\t\n",
- "\t\t\n",
+ "\t\t\n",
"\t\n",
"\n",
"\n",
"\n",
"\n",
- "\t\t\n",
- "\t\t0\n",
+ "\t\t\n",
+ "\t\t0\n",
"\t\n",
"\n",
"\n",
- "\t\t\n",
- "\t\t10\n",
+ "\t\t\n",
+ "\t\t10\n",
"\t\n",
"\n",
"\n",
- "\t\t\n",
- "\t\t20\n",
+ "\t\t\n",
+ "\t\t20\n",
"\t\n",
"\n",
"\n",
- "\t\t\n",
- "\t\t30\n",
+ "\t\t\n",
+ "\t\t30\n",
"\t\n",
"\n",
"\n",
- "\t\t\n",
- "\t\t40\n",
+ "\t\t\n",
+ "\t\t40\n",
"\t\n",
"\n",
"\n",
- "\t\t\n",
- "\t\t50\n",
+ "\t\t\n",
+ "\t\t50\n",
"\t\n",
"\n",
"\n",
- "\t\t\n",
- "\t\t0\n",
+ "\t\t\n",
+ "\t\t0\n",
"\t\n",
"\n",
"\n",
- "\t\t\n",
- "\t\t2\n",
+ "\t\t\n",
+ "\t\t2\n",
"\t\n",
"\n",
"\n",
- "\t\t\n",
- "\t\t4\n",
+ "\t\t\n",
+ "\t\t4\n",
"\t\n",
"\n",
"\n",
- "\t\t\n",
- "\t\t6\n",
+ "\t\t\n",
+ "\t\t6\n",
"\t\n",
"\n",
"\n",
- "\t\t\n",
- "\t\t8\n",
+ "\t\t\n",
+ "\t\t8\n",
"\t\n",
"\n",
"\n",
- "\t\t\n",
- "\t\t10\n",
+ "\t\t\n",
+ "\t\t10\n",
"\t\n",
"\n",
"\n",
- "\t\t\n",
- "\t\t12\n",
+ "\t\t\n",
+ "\t\t12\n",
"\t\n",
"\n",
"\n",
"\n",
"\n",
- "\t\n",
+ "\t\n",
+ "\n",
+ "\t\n",
+ "\t\tvelocity (m/s)\n",
+ "\t\n",
+ "\n",
+ "\n",
+ "\t\n",
+ "\t\ttime (s)\n",
+ "\t\n",
+ "\n",
"\n",
"\n",
"\tgnuplot_plot_1a\n",
- "\n",
+ "\n",
"\n",
"\n",
- "\t\n",
+ "\t\n",
"\t\n",
"\tgnuplot_plot_2a\n",
"\n",
- "\t\t \n",
- "\t\n",
- "\t\n",
"\t\n",
"\n",
@@ -419,7 +429,9 @@
}
],
"source": [
- "plot(t,v_analytical,'-',t,v_numerical,'o-')"
+ "plot(t,v_analytical,'-',t,v_numerical,'o-')\n",
+ "xlabel('time (s)')\n",
+ "ylabel('velocity (m/s)')"
]
}
],
diff --git a/01_Introduction/01-Introduction.ipynb b/01_Introduction/01-Introduction.ipynb
index b543fee..ccd5cd7 100644
--- a/01_Introduction/01-Introduction.ipynb
+++ b/01_Introduction/01-Introduction.ipynb
@@ -33,7 +33,7 @@
},
{
"cell_type": "code",
- "execution_count": 1,
+ "execution_count": 13,
"metadata": {
"collapsed": true,
"slideshow": {
@@ -60,7 +60,7 @@
},
{
"cell_type": "code",
- "execution_count": 18,
+ "execution_count": 4,
"metadata": {
"collapsed": false,
"slideshow": {
@@ -93,7 +93,7 @@
},
{
"cell_type": "code",
- "execution_count": 19,
+ "execution_count": 7,
"metadata": {
"collapsed": false,
"slideshow": {
@@ -149,7 +149,7 @@
},
{
"cell_type": "code",
- "execution_count": 6,
+ "execution_count": 8,
"metadata": {
"collapsed": false,
"slideshow": {
@@ -239,7 +239,7 @@
},
{
"cell_type": "code",
- "execution_count": 14,
+ "execution_count": 11,
"metadata": {
"collapsed": true,
"slideshow": {
@@ -305,98 +305,108 @@
"\n",
"\n",
"\t\n",
- "\t\t\n",
+ "\t\t\n",
"\t\n",
"\n",
"\n",
"\n",
"\n",
- "\t\t\n",
- "\t\t0\n",
+ "\t\t\n",
+ "\t\t0\n",
"\t\n",
"\n",
"\n",
- "\t\t\n",
- "\t\t10\n",
+ "\t\t\n",
+ "\t\t10\n",
"\t\n",
"\n",
"\n",
- "\t\t\n",
- "\t\t20\n",
+ "\t\t\n",
+ "\t\t20\n",
"\t\n",
"\n",
"\n",
- "\t\t\n",
- "\t\t30\n",
+ "\t\t\n",
+ "\t\t30\n",
"\t\n",
"\n",
"\n",
- "\t\t\n",
- "\t\t40\n",
+ "\t\t\n",
+ "\t\t40\n",
"\t\n",
"\n",
"\n",
- "\t\t\n",
- "\t\t50\n",
+ "\t\t\n",
+ "\t\t50\n",
"\t\n",
"\n",
"\n",
- "\t\t\n",
- "\t\t0\n",
+ "\t\t\n",
+ "\t\t0\n",
"\t\n",
"\n",
"\n",
- "\t\t\n",
- "\t\t2\n",
+ "\t\t\n",
+ "\t\t2\n",
"\t\n",
"\n",
"\n",
- "\t\t\n",
- "\t\t4\n",
+ "\t\t\n",
+ "\t\t4\n",
"\t\n",
"\n",
"\n",
- "\t\t\n",
- "\t\t6\n",
+ "\t\t\n",
+ "\t\t6\n",
"\t\n",
"\n",
"\n",
- "\t\t\n",
- "\t\t8\n",
+ "\t\t\n",
+ "\t\t8\n",
"\t\n",
"\n",
"\n",
- "\t\t\n",
- "\t\t10\n",
+ "\t\t\n",
+ "\t\t10\n",
"\t\n",
"\n",
"\n",
- "\t\t\n",
- "\t\t12\n",
+ "\t\t\n",
+ "\t\t12\n",
"\t\n",
"\n",
"\n",
"\n",
"\n",
- "\t\n",
+ "\t\n",
+ "\n",
+ "\t\n",
+ "\t\tvelocity (m/s)\n",
+ "\t\n",
+ "\n",
+ "\n",
+ "\t\n",
+ "\t\ttime (s)\n",
+ "\t\n",
+ "\n",
"\n",
"\n",
"\tgnuplot_plot_1a\n",
- "\n",
+ "\n",
"\n",
"\n",
- "\t\n",
+ "\t\n",
"\t\n",
"\tgnuplot_plot_2a\n",
"\n",
- "\t\t \n",
- "\t\n",
- "\t\n",
"\t\n",
"\n",
@@ -419,7 +429,9 @@
}
],
"source": [
- "plot(t,v_analytical,'-',t,v_numerical,'o-')"
+ "plot(t,v_analytical,'-',t,v_numerical,'o-')\n",
+ "xlabel('time (s)')\n",
+ "ylabel('velocity (m/s)')"
]
}
],
diff --git a/01_Introduction/octave-workspace b/01_Introduction/octave-workspace
index 8c437bb..cded7e4 100644
Binary files a/01_Introduction/octave-workspace and b/01_Introduction/octave-workspace differ
diff --git "a/01_Introduction/\340T\026\001" "b/01_Introduction/\340T\026\001"
new file mode 100644
index 0000000..e69de29
diff --git a/02_Roundoff-Truncation errors/.ipynb_checkpoints/lecture_02-checkpoint.ipynb b/02_Roundoff-Truncation errors/.ipynb_checkpoints/lecture_02-checkpoint.ipynb
index e9d80ec..d5b778e 100644
--- a/02_Roundoff-Truncation errors/.ipynb_checkpoints/lecture_02-checkpoint.ipynb
+++ b/02_Roundoff-Truncation errors/.ipynb_checkpoints/lecture_02-checkpoint.ipynb
@@ -28,6 +28,21 @@
"## 2 - Truncation"
]
},
+ {
+ "cell_type": "markdown",
+ "metadata": {
+ "slideshow": {
+ "slide_type": "fragment"
+ }
+ },
+ "source": [
+ "|Question|\tAnswered Right|\tAnswered Wrong\t|Total % Right\n",
+ "|-----------------------------|---|---|---|\n",
+ "|What is the 32-bit representation of e \"exp(1)\"?\t|37|\t26|\t58.7%|\n",
+ "|The command \">10+eps-10\" results in:\t|24|\t39\t|38.1%|\n",
+ "|Using a first-order Taylor series expansion and a time step, h, of 0.1 s, the order of expected truncation error is:\t|37\t|26|\t58.7%|"
+ ]
+ },
{
"cell_type": "markdown",
"metadata": {
@@ -283,7 +298,7 @@
"\n",
"or the truncation error for a first-order Taylor series approximation is\n",
"\n",
- "$\\frac{R_{1}}{t_{i+1}-t_{i}}=O(\\Delta t)$\n"
+ "$R_{1}=O(\\Delta t^{2})$\n"
]
},
{
diff --git a/02_Roundoff-Truncation errors/lecture_02.ipynb b/02_Roundoff-Truncation errors/lecture_02.ipynb
index e9d80ec..cd74c84 100644
--- a/02_Roundoff-Truncation errors/lecture_02.ipynb
+++ b/02_Roundoff-Truncation errors/lecture_02.ipynb
@@ -2,7 +2,7 @@
"cells": [
{
"cell_type": "code",
- "execution_count": 9,
+ "execution_count": 8,
"metadata": {
"collapsed": true,
"slideshow": {
@@ -28,6 +28,43 @@
"## 2 - Truncation"
]
},
+ {
+ "cell_type": "markdown",
+ "metadata": {
+ "slideshow": {
+ "slide_type": "subslide"
+ }
+ },
+ "source": [
+ "|Question|\tAnswered Right|\tAnswered Wrong\t|Total % Right\n",
+ "|-----------------------------|---|---|---|\n",
+ "|What is the 32-bit representation of e \"exp(1)\"?\t|47|\t35|\t57.3%|\n",
+ "|The command \">10+eps-10\" results in:\t|32|\t52\t|38.1%|\n",
+ "|Using a first-order Taylor series expansion and a time step, h, of 0.1 s, the order of expected truncation error is:\t|49\t|33|\t59.8%|"
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": 6,
+ "metadata": {
+ "collapsed": false,
+ "slideshow": {
+ "slide_type": "fragment"
+ }
+ },
+ "outputs": [
+ {
+ "name": "stdout",
+ "output_type": "stream",
+ "text": [
+ "0.0000000000000002220446049250313080847263336181640625000000000000\n"
+ ]
+ }
+ ],
+ "source": [
+ "fprintf('%1.64f',eps)"
+ ]
+ },
{
"cell_type": "markdown",
"metadata": {
@@ -249,7 +286,7 @@
},
{
"cell_type": "code",
- "execution_count": 16,
+ "execution_count": 7,
"metadata": {
"collapsed": true,
"slideshow": {
@@ -283,12 +320,12 @@
"\n",
"or the truncation error for a first-order Taylor series approximation is\n",
"\n",
- "$\\frac{R_{1}}{t_{i+1}-t_{i}}=O(\\Delta t)$\n"
+ "$R_{1}=O(\\Delta t^{2})$\n"
]
},
{
"cell_type": "code",
- "execution_count": 13,
+ "execution_count": 9,
"metadata": {
"collapsed": false,
"slideshow": {
@@ -298,6 +335,9 @@
"outputs": [],
"source": [
"function [v_analytical,v_terminal,t]=freefall(N)\n",
+ " % help file for freefall.m\n",
+ " % N is number of timesteps between 0 and 12 sec\n",
+ " % v_an...\n",
" t=linspace(0,12,N)';\n",
" c=0.25; m=60; g=9.81; v_terminal=sqrt(m*g/c);\n",
"\n",
@@ -320,7 +360,7 @@
},
{
"cell_type": "code",
- "execution_count": 17,
+ "execution_count": 13,
"metadata": {
"collapsed": false,
"slideshow": {
@@ -335,12 +375,12 @@
"time (s)|vel analytical (m/s)|vel numerical (m/s)\n",
"-----------------------------------------------\n",
" 0.0 | 0.00 | 0.00\n",
- " 2.2 | 20.12 | 20.88\n",
- " 4.4 | 34.33 | 36.32\n",
- " 6.5 | 42.10 | 44.08\n",
- " 7.6 | 44.29 | 45.95\n",
- " 9.8 | 46.72 | 47.69\n",
- " 12.0 | 47.77 | 48.26\n"
+ " 2.0 | 18.62 | 18.62\n",
+ " 4.0 | 32.46 | 32.46\n",
+ " 6.0 | 40.64 | 40.65\n",
+ " 8.0 | 44.85 | 44.85\n",
+ " 10.0 | 46.85 | 46.85\n",
+ " 12.0 | 47.77 | 47.77\n"
]
},
{
@@ -465,23 +505,10011 @@
"\n",
"\n",
"\n",
- "\t\n",
+ "\t\n",
"\t\n",
"\tgnuplot_plot_2a\n",
"\n",
- "\t\t \n",
+ "\t\t \n",
"\t\n",
- "\t