Skip to content

Commit

Permalink
A few fixes for the CoupledSpringMass notebook
Browse files Browse the repository at this point in the history
  • Loading branch information
WarrenWeckesser committed Dec 3, 2016
1 parent 718501e commit d2efe09
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions ipython/CoupledSpringMassSystem.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"no external forces, are $L_1$ and $L_2$.\n",
"\n",
"The masses are sliding on a surface that creates friction, so there are\n",
"two friction coefficients, b,,1,, and b,,2,,.\n",
"two friction coefficients, $b_1$ and $b_2$.\n",
"\n",
"The differential equations for this system are\n",
"\n",
Expand All @@ -46,7 +46,9 @@
"this to a system of first order differential equations. We introduce two\n",
"variables\n",
"\n",
"$y_1 = x_1'$, $y_2 = x_2'$\n",
"$y_1 = x_1'$\n",
"\n",
" $y_2 = x_2'$\n",
"\n",
"These are the velocities of the masses.\n",
"\n",
Expand All @@ -67,7 +69,7 @@
"equations (also known as a vector field). I have chosen to put the\n",
"function that defines the vector field in its own module (i.e. in its\n",
"own file), but this is not necessary. Note that the arguments of the\n",
"function are configured to be used with the function: the time t is the\n",
"function are configured to be used with the function odeint: the time t is the\n",
"second argument."
]
},
Expand Down Expand Up @@ -105,10 +107,9 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"Next, here is a script that uses to solve the equations for a given set\n",
"Next, here is a script that uses odeint to solve the equations for a given set\n",
"of parameter values, initial conditions, and time interval. The script\n",
"prints the points in the solution to the terminal. Normally you will\n",
"redirect its output to a file."
"writes the points to the file 'two_springs.dat'."
]
},
{
Expand Down Expand Up @@ -172,7 +173,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"The following script uses Matplotlib to plot the solution generated by"
"The following script uses Matplotlib to plot the solution generated by the above script."
]
},
{
Expand Down

0 comments on commit d2efe09

Please sign in to comment.