From a1b056012e51968afe83418cab2d7f990807528a Mon Sep 17 00:00:00 2001
From: Paul Romano <romano7@gmail.com>
Date: Wed, 14 Mar 2012 11:13:54 -0400
Subject: [PATCH] Fixed inputs in examples directory.

---
 examples/basic/materials.xml         | 11 ++++++-----
 examples/basic/settings.xml          |  5 -----
 examples/basic/tallies.xml           |  6 +++---
 examples/lattice/nested/geometry.xml |  4 ++--
 examples/lattice/nested/plot.xml     |  6 ------
 examples/lattice/nested/plots.xml    | 10 ++++++++++
 examples/lattice/nested/tallies.xml  |  6 +++---
 examples/lattice/simple/geometry.xml |  2 +-
 examples/lattice/simple/plot.xml     |  6 ------
 examples/lattice/simple/plots.xml    | 10 ++++++++++
 examples/lattice/simple/tallies.xml  |  6 +++---
 examples/reflective/materials.xml    |  5 +++--
 examples/reflective/settings.xml     |  5 -----
 13 files changed, 41 insertions(+), 41 deletions(-)
 delete mode 100644 examples/lattice/nested/plot.xml
 create mode 100644 examples/lattice/nested/plots.xml
 delete mode 100644 examples/lattice/simple/plot.xml
 create mode 100644 examples/lattice/simple/plots.xml

diff --git a/examples/basic/materials.xml b/examples/basic/materials.xml
index 88e20c69e..e50a42311 100644
--- a/examples/basic/materials.xml
+++ b/examples/basic/materials.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0"?>
 <materials>
 
-<!-- Definition of materials -->
+  <default_xs>70c</default_xs>
+
   <material id="40">
     <density value="4.5" units="g/cc" />
-    <nuclide name="U-235" xs="03c" ao="1.0" />
+    <nuclide name="U-235" ao="1.0" />
   </material>
 
   <material id="41">
     <density value="1.0" units="g/cc" />
-    <nuclide name="H-1" xs="03c" ao="2.0" />
-    <nuclide name="O-16" xs="03c" ao="1.0" />
-    <sab name="lwe7" xs="00t" />
+    <nuclide name="H-1" ao="2.0" />
+    <nuclide name="O-16" ao="1.0" />
+    <sab name="lwtr" xs="10t" />
   </material>
 
 </materials>
diff --git a/examples/basic/settings.xml b/examples/basic/settings.xml
index a9a83dfe5..e9c2e7842 100644
--- a/examples/basic/settings.xml
+++ b/examples/basic/settings.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <settings>
 
-  <!-- Path for cross section library -->
-  <cross_sections>
-      /home/paulromano/openmc/cross_sections_serpent.xml
-  </cross_sections>
-
   <!-- Parameters for criticality calculation -->
   <criticality>
     <cycles>15</cycles>
diff --git a/examples/basic/tallies.xml b/examples/basic/tallies.xml
index acafe7674..a434deae1 100644
--- a/examples/basic/tallies.xml
+++ b/examples/basic/tallies.xml
@@ -5,7 +5,7 @@
     <filters>
       <cell>100</cell>
     </filters>
-    <macros>total scatter nu-scatter absorption fission nu-fission</macros>
+    <scores>total scatter nu-scatter absorption fission nu-fission</scores>
   </tally>
 
   <tally id="2">
@@ -13,7 +13,7 @@
       <cell>100</cell>
       <energy>0 20.0</energy>
     </filters>
-    <macros>total scatter nu-scatter absorption fission nu-fission</macros>
+    <scores>total scatter nu-scatter absorption fission nu-fission</scores>
   </tally>
 
   <tally id="3">
@@ -22,7 +22,7 @@
       <energy>0 20.0</energy>
       <energyout>0 20.0</energyout>
     </filters>
-    <macros>scatter nu-scatter nu-fission</macros>
+    <scores>scatter nu-scatter nu-fission</scores>
   </tally>
 
 </tallies>
diff --git a/examples/lattice/nested/geometry.xml b/examples/lattice/nested/geometry.xml
index 4ce62280a..f223cf3bb 100644
--- a/examples/lattice/nested/geometry.xml
+++ b/examples/lattice/nested/geometry.xml
@@ -14,7 +14,7 @@
   <lattice id="4">
     <type>rectangular</type>
     <dimension>2 2</dimension>
-    <origin>-1.0 -1.0</origin>
+    <lower_left>-1.0 -1.0</lower_left>
     <width>1.0 1.0</width>
     <universes>
       1 2
@@ -26,7 +26,7 @@
   <lattice id="6">
     <type>rectangular</type>
     <dimension>2 2</dimension>
-    <origin>-2.0 -2.0</origin>
+    <lower_left>-2.0 -2.0</lower_left>
     <width>2.0 2.0</width>
     <universes>
       5 5
diff --git a/examples/lattice/nested/plot.xml b/examples/lattice/nested/plot.xml
deleted file mode 100644
index d6a0ca3cd..000000000
--- a/examples/lattice/nested/plot.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<plot>
-  <origin>0. 0. 0.</origin>
-  <width>3.999 3.999</width>
-  <pixel>0.01</pixel>
-</plot>
diff --git a/examples/lattice/nested/plots.xml b/examples/lattice/nested/plots.xml
new file mode 100644
index 000000000..a8c6fbb7c
--- /dev/null
+++ b/examples/lattice/nested/plots.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<plots>
+
+  <plot id="1" color="mat">
+    <origin>0. 0. 0.</origin>
+    <width>4.0 4.0</width>
+    <pixels>400 400</pixels>
+  </plot>
+
+</plots>
diff --git a/examples/lattice/nested/tallies.xml b/examples/lattice/nested/tallies.xml
index a389dc905..271e81fe7 100644
--- a/examples/lattice/nested/tallies.xml
+++ b/examples/lattice/nested/tallies.xml
@@ -4,7 +4,7 @@
   <mesh id="1">
     <type>rectangular</type>
     <dimension>4 4</dimension>
-    <origin>-2.0 -2.0</origin>
+    <lower_left>-2.0 -2.0</lower_left>
     <width>1.0 1.0</width>
   </mesh>
 
@@ -13,7 +13,7 @@
       <mesh>1</mesh>
     </filters>
 
-    <macros>total</macros>
+    <scores>total</scores>
   </tally>
 
-</tallies>
\ No newline at end of file
+</tallies>
diff --git a/examples/lattice/simple/geometry.xml b/examples/lattice/simple/geometry.xml
index 4a7722939..b5bad90b9 100644
--- a/examples/lattice/simple/geometry.xml
+++ b/examples/lattice/simple/geometry.xml
@@ -12,7 +12,7 @@
   <lattice id="5">
     <type>rectangular</type>
     <dimension>4 4</dimension>
-    <origin>-2.0 -2.0</origin>
+    <lower_left>-2.0 -2.0</lower_left>
     <width>1.0 1.0</width>
     <universes>
       1 2 1 2
diff --git a/examples/lattice/simple/plot.xml b/examples/lattice/simple/plot.xml
deleted file mode 100644
index d6a0ca3cd..000000000
--- a/examples/lattice/simple/plot.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<plot>
-  <origin>0. 0. 0.</origin>
-  <width>3.999 3.999</width>
-  <pixel>0.01</pixel>
-</plot>
diff --git a/examples/lattice/simple/plots.xml b/examples/lattice/simple/plots.xml
new file mode 100644
index 000000000..a8c6fbb7c
--- /dev/null
+++ b/examples/lattice/simple/plots.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<plots>
+
+  <plot id="1" color="mat">
+    <origin>0. 0. 0.</origin>
+    <width>4.0 4.0</width>
+    <pixels>400 400</pixels>
+  </plot>
+
+</plots>
diff --git a/examples/lattice/simple/tallies.xml b/examples/lattice/simple/tallies.xml
index a389dc905..271e81fe7 100644
--- a/examples/lattice/simple/tallies.xml
+++ b/examples/lattice/simple/tallies.xml
@@ -4,7 +4,7 @@
   <mesh id="1">
     <type>rectangular</type>
     <dimension>4 4</dimension>
-    <origin>-2.0 -2.0</origin>
+    <lower_left>-2.0 -2.0</lower_left>
     <width>1.0 1.0</width>
   </mesh>
 
@@ -13,7 +13,7 @@
       <mesh>1</mesh>
     </filters>
 
-    <macros>total</macros>
+    <scores>total</scores>
   </tally>
 
-</tallies>
\ No newline at end of file
+</tallies>
diff --git a/examples/reflective/materials.xml b/examples/reflective/materials.xml
index eb55455f7..3ae574ff3 100644
--- a/examples/reflective/materials.xml
+++ b/examples/reflective/materials.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <materials>
 
-<!-- Definition of materials -->
+  <default_xs>70c</default_xs>
+
   <material id="1">
     <density value="4.5" units="g/cc" />
-    <nuclide name="U-235" xs="03c" ao="1.0" />
+    <nuclide name="U-235" ao="1.0" />
   </material>
 
 </materials>
diff --git a/examples/reflective/settings.xml b/examples/reflective/settings.xml
index 007b9cdd9..02ad73630 100644
--- a/examples/reflective/settings.xml
+++ b/examples/reflective/settings.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <settings>
 
-  <!-- Path for cross section library -->
-  <cross_sections>
-      /home/paulromano/openmc/cross_sections_serpent.xml
-  </cross_sections>
-
   <!-- Parameters for criticality calculation -->
   <criticality>
     <cycles>500</cycles>