Merge pull request #47 from jbae11/scenario_specification

Scenario specification
arfc · Aug 31, 2017 · 1896baf · 1896baf
2 parents d268eaa + 0f798ee
commit 1896baf
Show file tree

Hide file tree

Showing 26 changed files with 15,629 additions and 3,619 deletions.
diff --git a/2017-bae-europe/eu_future/eu_future.ipynb b/2017-bae-europe/eu_future/eu_future.ipynb
diff --git a/2017-bae-europe/eu_future/eu_future.xml b/2017-bae-europe/eu_future/eu_future.xml
diff --git a/2017-bae-europe/france_only/france_only.ipynb b/2017-bae-europe/france_only/france_only.ipynb
diff --git a/2017-bae-europe/france_only/france_only.xml b/2017-bae-europe/france_only/france_only.xml
diff --git a/2017-bae-europe/french_transition/astrid.xml b/2017-bae-europe/french_transition/astrid.xml
diff --git a/2017-bae-europe/french_transition/french_transition.ipynb b/2017-bae-europe/french_transition/french_transition.ipynb
diff --git a/2017-bae-europe/french_transition/mixer.xml b/2017-bae-europe/french_transition/mixer.xml
diff --git a/eg01-eg23/complex.xml b/eg01-eg23/complex.xml
diff --git a/eg01-eg23/eg01-eg23-complex.xml b/eg01-eg23/eg01-eg23-complex.xml
diff --git a/eg01-eg23/eg01-eg23-cycamore.ipynb b/eg01-eg23/eg01-eg23-cycamore.ipynb
diff --git a/eg01-eg23/eg01-eg23-simple.xml b/eg01-eg23/eg01-eg23-simple.xml
@@ -1301,10 +1301,10 @@ CF = 12.9*.998/12.9 = .998
    <recipe>
     <name>sfr_waste_recipe</name>
     <basis>mass</basis>
-     <nuclide> <id>U238</id>  <comp>78.5</comp> </nuclide> 
-     <nuclide> <id>Pu239</id>  <comp>12.9</comp> </nuclide> 
-     <nuclide> <id>Am241</id>  <comp>0.0011</comp> </nuclide> 
-     <nuclide> <id>Cs137</id>  <comp>7.40</comp> </nuclide> 
+     <nuclide> <id>U238</id>  <comp>79.29</comp> </nuclide> 
+     <nuclide> <id>Pu239</id>  <comp>13.102</comp> </nuclide> 
+     <nuclide> <id>Am241</id>  <comp>0.1205</comp> </nuclide> 
+     <nuclide> <id>Cs137</id>  <comp>7.4791</comp> </nuclide> 
 
   </recipe>