From 444ecfa0705cce08cc526dd32b2cd0ce4afbd35b Mon Sep 17 00:00:00 2001
From: Will Boyd <wbinventor@gmail.com>
Date: Thu, 26 Feb 2015 13:43:14 -0500
Subject: [PATCH] Updated HDF5 summary with complete hexagonal lattice
 specifications

---
 docs/source/usersguide/input.rst |  2 +-
 src/hdf5_summary.F90             | 48 ++++++++------------------------
 2 files changed, 12 insertions(+), 38 deletions(-)

diff --git a/docs/source/usersguide/input.rst b/docs/source/usersguide/input.rst
index cb1a57703..dd404a0db 100644
--- a/docs/source/usersguide/input.rst
+++ b/docs/source/usersguide/input.rst
@@ -789,7 +789,7 @@ The following quadratic surfaces can be modeled:
 Each ``<cell>`` element can have the following attributes or sub-elements:
 
   :id:
-    A unique integer that can be used to identify the surface.
+    A unique integer that can be used to identify the cell.
 
     *Default*: None
 
diff --git a/src/hdf5_summary.F90 b/src/hdf5_summary.F90
index f318a47ea..0c2926a88 100644
--- a/src/hdf5_summary.F90
+++ b/src/hdf5_summary.F90
@@ -324,14 +324,14 @@ contains
         call su % write_data(lat % n_cells, "n_cells", length=3, &
              group="geometry/lattices/lattice " // trim(to_str(lat % id)))
 
-        ! Write lattice dimensions, lower left corner, and width of element
+        ! Write lattice dimensions, lower left corner, and pitch
         call su % write_data(lat % dimension, "dimension", &
              length=lat % n_dimension, &
              group="geometry/lattices/lattice " // trim(to_str(lat % id)))
         call su % write_data(lat % lower_left, "lower_left", &
              length=lat % n_dimension, &
              group="geometry/lattices/lattice " // trim(to_str(lat % id)))
-        call su % write_data(lat % width, "width", &
+        call su % write_data(lat % pitch, "pitch", &
              length=lat % n_dimension, &
              group="geometry/lattices/lattice " // trim(to_str(lat % id)))
 
@@ -347,24 +347,6 @@ contains
           n_z = 1
         end if
 
-        ! Write lattice lower-left.
-        if (lat % is_3d) then
-          call su % write_data(lat % lower_left, "lower_left", length=3, &
-               group="geometry/lattices/lattice " // trim(to_str(lat % id)))
-        else
-          call su % write_data(lat % lower_left, "lower_left", length=2, &
-               group="geometry/lattices/lattice " // trim(to_str(lat % id)))
-        end if
-
-        ! Write lattice pitch.
-        if (lat % is_3d) then
-          call su % write_data(lat % pitch, "pitch", length=3, &
-               group="geometry/lattices/lattice " // trim(to_str(lat % id)))
-        else
-          call su % write_data(lat % pitch, "pitch", length=2, &
-               group="geometry/lattices/lattice " // trim(to_str(lat % id)))
-        end if
-
         ! Write lattice universes.
         allocate(lattice_universes(lat % n_cells(1), lat % n_cells(2), &
             &lat % n_cells(3)))
@@ -391,23 +373,15 @@ contains
         call su % write_data(lat % n_rings, "n_axial", &
              group="geometry/lattices/lattice " // trim(to_str(lat % id)))
 
-        ! Write lattice center.
-        if (lat % is_3d) then
-          call su % write_data(lat % center, "center", length=3, &
-               group="geometry/lattices/lattice " // trim(to_str(lat % id)))
-        else
-          call su % write_data(lat % center, "center", length=2, &
-               group="geometry/lattices/lattice " // trim(to_str(lat % id)))
-        end if
-
-        ! Write lattice pitch.
-        if (lat % is_3d) then
-          call su % write_data(lat % pitch, "pitch", length=2, &
-               group="geometry/lattices/lattice " // trim(to_str(lat % id)))
-        else
-          call su % write_data(lat % pitch, "pitch", length=1, &
-               group="geometry/lattices/lattice " // trim(to_str(lat % id)))
-        end if
+        ! Write lattice center, pitch and outer universe.
+        call su % write_data(lat % center, "center", &
+             length=lat % n_dimension, &
+             group="geometry/lattices/lattice " // trim(to_str(lat % id)))
+        call su % write_data(lat % pitch, "pitch", &
+             length=lat % n_dimension, &
+             group="geometry/lattices/lattice " // trim(to_str(lat % id)))
+        call su % write_data(lat % outer, "outer", &
+             group="geometry/lattices/lattice " // trim(to_str(lat % id)))
 
         ! Write lattice universes.
         allocate(lattice_universes(2*lat % n_rings - 1, 2*lat % n_rings - 1, &