Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
deleted deprecated files
  • Loading branch information
@rcc02007
rcc02007 committed Aug 29, 2017
1 parent d16475b commit f431de1
Show file tree
Hide file tree
Showing 7 changed files with 100 additions and 690 deletions.
32 changes: 16 additions & 16 deletions 01_Introduction/lecture_01-Copy1.ipynb → ...ckpoints/01-Introduction-checkpoint.ipynb
View file
Expand Up @@ -33,7 +33,7 @@
},
{
"cell_type": "code",
"execution_count": 12,
"execution_count": 1,
"metadata": {
"collapsed": true,
"slideshow": {
Expand Down Expand Up @@ -64,7 +64,7 @@
"metadata": {
"collapsed": false,
"slideshow": {
"slide_type": "subslide"
"slide_type": "fragment"
}
},
"outputs": [],
Expand Down Expand Up @@ -97,7 +97,7 @@
"metadata": {
"collapsed": false,
"slideshow": {
"slide_type": "subslide"
"slide_type": "fragment"
}
},
"outputs": [
Expand Down Expand Up @@ -199,7 +199,7 @@
"metadata": {
"collapsed": false,
"slideshow": {
"slide_type": "subslide"
"slide_type": "fragment"
}
},
"outputs": [
Expand All @@ -226,20 +226,29 @@
"fprintf('%7.1f | %18.2f | %15.2f\\n',M(:,1:3)');"
]
},
{
"cell_type": "markdown",
"metadata": {
"slideshow": {
"slide_type": "slide"
}
},
"source": [
"## Set default values for plotting"
]
},
{
"cell_type": "code",
"execution_count": 14,
"metadata": {
"collapsed": true,
"slideshow": {
"slide_type": "subslide"
"slide_type": "fragment"
}
},
"outputs": [],
"source": [
"set (0, \"defaultaxesfontname\", \"Helvetica\")\n",
"set (0, \"defaultaxesfontsize\", 18)\n",
"set (0, \"defaulttextfontname\", \"Helvetica\")\n",
"set (0, \"defaulttextfontsize\", 18) \n",
"set (0, \"defaultlinelinewidth\", 4)"
]
Expand Down Expand Up @@ -412,15 +421,6 @@
"source": [
"plot(t,v_analytical,'-',t,v_numerical,'o-')"
]
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {
"collapsed": true
},
"outputs": [],
"source": []
}
],
"metadata": {
Expand Down
138 changes: 84 additions & 54 deletions ...kpoints/lecture_01-Copy1-checkpoint.ipynb → 01_Introduction/01-Introduction.ipynb
View file
Expand Up @@ -13,35 +13,36 @@
]
},
{
"cell_type": "code",
"execution_count": 13,
"cell_type": "markdown",
"metadata": {
"collapsed": true,
"slideshow": {
"slide_type": "skip"
"slide_type": "subslide"
}
},
"outputs": [],
"source": [
"%plot --format svg"
"An object falling is subject to the force of \n",
"\n",
"- gravity ($F_g$=mg) and \n",
"- drag ($F_d=cv^2$)\n",
"\n",
"Acceleration of the object:\n",
"\n",
"$\\sum F=ma=F_g-F_d=mg - cv^2 = m\\frac{dv}{dt}$\n",
"\n"
]
},
{
"cell_type": "code",
"execution_count": 14,
"execution_count": 1,
"metadata": {
"collapsed": true,
"slideshow": {
"slide_type": "slide"
"slide_type": "skip"
}
},
"outputs": [],
"source": [
"set (0, \"defaultaxesfontname\", \"Helvetica\")\n",
"set (0, \"defaultaxesfontsize\", 18)\n",
"set (0, \"defaulttextfontname\", \"Helvetica\")\n",
"set (0, \"defaulttextfontsize\", 18) \n",
"set (0, \"defaultlinelinewidth\", 4)"
"%plot --format svg"
]
},
{
Expand All @@ -59,45 +60,18 @@
},
{
"cell_type": "code",
"execution_count": 2,
"execution_count": 18,
"metadata": {
"collapsed": false,
"slideshow": {
"slide_type": "subslide"
"slide_type": "fragment"
}
},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"t =\n",
"\n",
" 0\n",
" 2\n",
" 4\n",
" 6\n",
" 8\n",
" 10\n",
" 12\n",
"\n",
"t =\n",
"\n",
" 0\n",
" 2\n",
" 4\n",
" 6\n",
" 8\n",
" 10\n",
" 12\n",
"\n"
]
}
],
"outputs": [],
"source": [
"t=[0,2,4,6,8,10,12]'\n",
"% or\n",
"t=[0:2:12]'"
"t=[0,2,4,6,8,10,12]';\n",
"% or \n",
"t=[0:2:12]';"
]
},
{
Expand All @@ -108,23 +82,30 @@
}
},
"source": [
"Define constants and analytical solution (meters-kilogram-sec)"
"### Define constants and analytical solution (meters-kilogram-sec)\n",
"\n",
"g=9.81 m/s$^2$, c=0.25 kg/m, m=60 kg\n",
"\n",
"$v_{terminal}=\\sqrt{\\frac{mg}{c}}$\n",
"\n",
"$v=v_{terminal}\\tanh{\\left(\\frac{gt}{v_{terminal}}\\right)}$"
]
},
{
"cell_type": "code",
"execution_count": 4,
"execution_count": 19,
"metadata": {
"collapsed": false,
"slideshow": {
"slide_type": "subslide"
"slide_type": "fragment"
}
},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"v_terminal = 48.522\n",
"v_analytical =\n",
"\n",
" 0.00000\n",
Expand All @@ -139,14 +120,36 @@
}
],
"source": [
"c=0.25; m=60; g=9.81; v_terminal=sqrt(m*g/c);\n",
"c=0.25; m=60; g=9.81; v_terminal=sqrt(m*g/c)\n",
"\n",
"v_analytical = v_terminal*tanh(g*t/v_terminal)"
]
},
{
"cell_type": "markdown",
"metadata": {
"slideshow": {
"slide_type": "slide"
}
},
"source": [
"### Define numerical method\n",
"#### Finite difference approximation\n",
"\n",
"$\\frac{v(t_{i+1})-v(t_{i})}{t_{i+1}-t_{i}}=g-\\frac{c}{m}v(t_{i})^2$\n",
"\n",
"solve for $v(t_{i+1})$\n",
"\n",
"$v(t_{i+1})=v(t_{i})+\\left(g-\\frac{c}{m}v(t_{i})^2\\right)(t_{i+1}-t_{i})$\n",
"\n",
"or\n",
"\n",
"$v(t_{i+1})=v(t_{i})+\\frac{dv_{i}}{dt}(t_{i+1}-t_{i})$\n"
]
},
{
"cell_type": "code",
"execution_count": 16,
"execution_count": 6,
"metadata": {
"collapsed": false,
"slideshow": {
Expand Down Expand Up @@ -192,11 +195,11 @@
},
{
"cell_type": "code",
"execution_count": 12,
"execution_count": 10,
"metadata": {
"collapsed": false,
"slideshow": {
"slide_type": "subslide"
"slide_type": "fragment"
}
},
"outputs": [
Expand All @@ -223,9 +226,36 @@
"fprintf('%7.1f | %18.2f | %15.2f\\n',M(:,1:3)');"
]
},
{
"cell_type": "markdown",
"metadata": {
"slideshow": {
"slide_type": "slide"
}
},
"source": [
"## Set default values for plotting"
]
},
{
"cell_type": "code",
"execution_count": 14,
"metadata": {
"collapsed": true,
"slideshow": {
"slide_type": "fragment"
}
},
"outputs": [],
"source": [
"set (0, \"defaultaxesfontsize\", 18)\n",
"set (0, \"defaulttextfontsize\", 18) \n",
"set (0, \"defaultlinelinewidth\", 4)"
]
},
{
"cell_type": "code",
"execution_count": 7,
"execution_count": 15,
"metadata": {
"collapsed": false,
"slideshow": {
Expand Down

0 comments on commit f431de1

Please sign in to comment.