Merge branch 'master' of github.com:pyne/tutorial

Author: scopatz

00-intro.ipynb

@@ -70,7 +70,7 @@
       "As out tagline says, PyNE is the open source nuclear engineering toolkit.  \n",
       "\n",
       "* PyNE is intended as a library of composable tools that is used to build nuclear science and engineering applications.\n",
-      "* It is permisively licesnced (2-clause BSD)\n",
+      "* It is permissively licensed (2-clause BSD)\n",
       "* It supports both a C++ and a Python API.\n",
       "* The name 'PyNE' is a bit of a misnomer since most of the code base is in C++ but most daily usage happens in Python.\n",
       "* The v0.3 code base was just released!\n",
@@ -161,7 +161,7 @@
      "source": [
       "# What goes into PyNE?\n",
       "\n",
-      "Anything that is not export controlable, proprietary, or under HIPPA restrictions!  (If you have questions, ask.)"
+      "Anything that is not export controllable, proprietary, or under HIPPA restrictions!  (If you have questions, ask.)"
      ]
     },
     {

01-nuclide-naming.ipynb

@@ -27,7 +27,7 @@
       " * **id (zas)**: This type places the charge of the nucleus out front, then has three\n",
       "   digits for the atomic mass number, and ends with four state digits (0 = ground,\n",
       "   1 = first excited state, 2 = second excited state, etc).  Uranium-235 here would\n",
-      "   be expressed as '922350000'.  This is th canonical form for nuclides.\n",
+      "   be expressed as '922350000'.  This is the canonical form for nuclides.\n",
       " * **name**: This is the more common, human readable notation.  The chemical symbol\n",
       "   (one or two characters long) is first, followed by the atomic weight.  Lastly if\n",
       "   the nuclide is metastable, the letter *M* is concatenated to the end.  For\n",
@@ -302,7 +302,7 @@
       "\n",
       "# Ambiguous Forms\n",
       "\n",
-      "For some nulcides and forms, it is not automatically discernable which \n"
+      "For some nuclides and forms, it is not automatically discernable which \n"
      ]
     },
     {

05-cross-sections.ipynb

@@ -157,6 +157,7 @@
      "cell_type": "code",
      "collapsed": false,
      "input": [
+      "import numpy as np\n",
       "dst_e_g = np.logspace(1, -7, 11)\n",
       "eds.dst_group_struct = dst_e_g\n",
       "gamma_c = eds.discretize('U235', 'gamma')\n",
@@ -191,8 +192,7 @@
       "from pyne.bins import stair_step\n",
       "import matplotlib.pyplot as plt\n",
       "import matplotlib\n",
-      "matplotlib.rc('font', family='serif', size=14)\n",
-      "import numpy as np"
+      "matplotlib.rc('font', family='serif', size=14)\n"
      ],
      "language": "python",
      "metadata": {},

06-transmutation.ipynb

@@ -13,7 +13,7 @@
      "source": [
       "# Transmutation\n",
       "\n",
-      "As of v0.3, PyNE has a nascent support for native transmutation.  The only implementation right now is a recurssive chain solver, though we envision a suite of tools. To enable this future vision each solver will have a `Transmute` class which has a `transmute()` method.  Though this may seem like extra work from the users perspective, it enables rapid speedups by pre-loading cross section data and/or pre-computing decay chains.  \n",
+      "As of v0.3, PyNE has a nascent support for native transmutation.  The only implementation right now is a recursive chain solver, though we envision a suite of tools. To enable this future vision each solver will have a `Transmute` class which has a `transmute()` method.  Though this may seem like extra work from the users perspective, it enables rapid speedups by pre-loading cross section data and/or pre-computing decay chains.  \n",
       "\n",
       "The `transmute()` method accepts a material, as well as other parameters.  "
      ]

07-mesh-basics.ipynb

@@ -83,7 +83,7 @@
      "cell_type": "markdown",
      "metadata": {},
      "source": [
-      "We access volume elements (`ve`) on the mesh through a volume element index (`ve_idx`).  This index is a unique integer `i` that gives a sort ordering to an otherwise unorder mesh.  The volume element index is defined on the range from 0 (inclusive) to the number of volumes in the mesh (exclusive).  You may access a volume element's material through the `mats` attribute and indexing with `i`."
+      "We access volume elements (`ve`) on the mesh through a volume element index (`ve_idx`).  This index is a unique integer `i` that gives a sort ordering to an otherwise unordered mesh.  The volume element index is defined on the range from 0 (inclusive) to the number of volumes in the mesh (exclusive).  You may access a volume element's material through the `mats` attribute and indexing with `i`."
      ]
     },
     {

08-diffusion.ipynb

@@ -77,7 +77,7 @@
      "source": [
       "### The Laplacian\n",
       "\n",
-      "The functions in the following cell solve for the laplacian ($\\nabla^2$) for any index in in the mesh using a [3 point stencil](http://en.wikipedia.org/wiki/Five-point_stencil) along each axis. This implements relfecting boundary conditions along the edges of the domain."
+      "The functions in the following cell solve for the laplacian ($\\nabla^2$) for any index in in the mesh using a [3 point stencil](http://en.wikipedia.org/wiki/Five-point_stencil) along each axis. This implements reflecting boundary conditions along the edges of the domain."
      ]
     },
     {
@@ -124,7 +124,7 @@
      "source": [
       "### Solve in space\n",
       "\n",
-      "The ``timestep()`` fucntion sweeps through the entire mesh and computes the new flux everywhere.  This opperation takes place enritely on the mesh object."
+      "The ``timestep()`` function sweeps through the entire mesh and computes the new flux everywhere.  This operation takes place entirely on the mesh object."
      ]
     },
     {
@@ -197,7 +197,7 @@
      "source": [
       "### Reactor\n",
       "\n",
-      "This setups up a simple light water reactor fuel pin in a water cell.  Note that our cells are allowed to have varing aspect ratios.  This alows us to be corsely refined inside of the pin, finely refined around the edge of the pin, and then have a differernt coarse refinement out in the coolant."
+      "This setups up a simple light water reactor fuel pin in a water cell.  Note that our cells are allowed to have varing aspect ratios.  This allows us to be coarsely refined inside of the pin, finely refined around the edge of the pin, and then have a different coarse refinement out in the coolant."
      ]
     },
     {

09-outro.ipynb

@@ -15,7 +15,7 @@
       "\n",
       "![PyNE Tree](https://raw.github.com/pyne/pyne/staging/img/pyne_icon_big.png)\n",
       "\n",
-      "There are a vareity of other things in PyNE that we are not showing you today because they are impractical in this kind of tutorial:\n",
+      "There are a variety of other things in PyNE that we are not showing you today because they are impractical in this kind of tutorial:\n",
       "\n",
       "* Enrichment\n",
       "* Material Libraries\n",