From a704b412ee11436a40796dff49253474b9f2b2f1 Mon Sep 17 00:00:00 2001
From: Nick Horelik <nicholas.horelik@gmail.com>
Date: Wed, 12 Nov 2014 19:24:58 -0500
Subject: [PATCH] Added support for plot level depth, removed id from filename

---
 src/input_xml.F90   | 18 ++++++++++++++----
 src/output.F90      |  6 ++++++
 src/plot.F90        | 28 ++++++++++++++++++++++------
 src/plot_header.F90 |  4 ++++
 4 files changed, 46 insertions(+), 10 deletions(-)

diff --git a/src/input_xml.F90 b/src/input_xml.F90
index e992a0eae0..340e430c78 100644
--- a/src/input_xml.F90
+++ b/src/input_xml.F90
@@ -2735,11 +2735,9 @@ contains
         call get_node_value(node_plot, "filename", filename)
       select case (pl % type)
       case (PLOT_TYPE_SLICE)
-        pl % path_plot = trim(path_input) // trim(to_str(pl % id)) // &
-             "_" // trim(filename) // ".ppm"
+        pl % path_plot = trim(path_input) // trim(filename) // ".ppm"
       case (PLOT_TYPE_VOXEL)
-        pl % path_plot = trim(path_input) // trim(to_str(pl % id)) // &
-             "_" // trim(filename) // ".voxel"
+        pl % path_plot = trim(path_input) // trim(filename) // ".voxel"
       end select
 
       ! Copy plot pixel size
@@ -2819,6 +2817,18 @@ contains
         end if
       end if
 
+      ! Copy plot cell universe level
+      if (check_for_node(node_plot, "level")) then
+        call get_node_value(node_plot, "level", pl % level)
+        
+        if (pl % level < 0) then
+          call fatal_error("Bad universe level in plot " &
+               &// trim(to_str(pl % id)))
+        end if
+      else
+        pl % level = PLOT_LEVEL_LOWEST
+      end if
+
       ! Copy plot color type and initialize all colors randomly
       temp_str = "cell"
       if (check_for_node(node_plot, "color")) &
diff --git a/src/output.F90 b/src/output.F90
index 4d0ef7edd4..ce5059feb8 100644
--- a/src/output.F90
+++ b/src/output.F90
@@ -1428,6 +1428,12 @@ contains
       ! Plot id
       write(ou,100) "Plot ID:", trim(to_str(pl % id))
 
+      ! Plot filename
+      write(ou,100) "Plot file:", trim(pl % path_plot)
+
+      ! Plot level
+      write(ou,100) "Universe depth:", trim(to_str(pl % level))
+
       ! Plot type
       if (pl % type == PLOT_TYPE_SLICE) then
         write(ou,100) "Plot Type:", "Slice"
diff --git a/src/plot.F90 b/src/plot.F90
index 1297b746c4..ddc4641b2a 100644
--- a/src/plot.F90
+++ b/src/plot.F90
@@ -7,7 +7,7 @@ module plot
   use global
   use mesh,            only: get_mesh_indices
   use output,          only: write_message
-  use particle_header, only: deallocate_coord, Particle
+  use particle_header, only: deallocate_coord, Particle, LocalCoord
   use plot_header
   use ppmlib,          only: Image, init_image, allocate_image, &
                              deallocate_image, set_pixel
@@ -32,7 +32,7 @@ contains
 
       ! Display output message
       call write_message("Processing plot " // trim(to_str(pl % id)) &
-           &// "...", 5)
+           &// ": " // trim(pl % path_plot) // " ...", 5)
 
       if (pl % type == PLOT_TYPE_SLICE) then
         ! create 2d image
@@ -58,7 +58,9 @@ contains
     integer, intent(out)                  :: id
     
     logical :: found_cell
-    type(Cell), pointer :: c => null()
+    integer :: level
+    type(Cell),       pointer :: c => null()
+    type(LocalCoord), pointer :: coord => null()
     
     call deallocate_coord(p % coord0 % next)
     p % coord => p % coord0
@@ -66,6 +68,16 @@ contains
     call find_cell(p, found_cell)
     if (check_overlaps) call check_cell_overlap(p)
 
+    ! Loop through universes and stop on any specified level
+    level = 0
+    coord => p % coord0
+    do
+      if (level == pl % level) exit
+      if (.not. associated(coord % next)) exit
+      coord => coord % next
+      level = level + 1
+    end do
+    
     if (.not. found_cell) then
       ! If no cell, revert to default color
       rgb = pl % not_found % rgb
@@ -73,19 +85,23 @@ contains
     else
       if (pl % color_by == PLOT_COLOR_MATS) then
         ! Assign color based on material
-        c => cells(p % coord % cell)
+        c => cells(coord % cell)
         if (c % material == MATERIAL_VOID) then
           ! By default, color void cells white
           rgb = 255
           id = -1
+        else if (c % type == CELL_FILL) then
+          ! If we stopped on a middle universe level, treat as if not found
+          rgb = pl % not_found % rgb
+          id = -1
         else
           rgb = pl % colors(c % material) % rgb
           id = materials(c % material) % id
         end if
       else if (pl % color_by == PLOT_COLOR_CELLS) then
         ! Assign color based on cell
-        rgb = pl % colors(p % coord % cell) % rgb
-        id = cells(p % coord % cell) % id
+        rgb = pl % colors(coord % cell) % rgb
+        id = cells(coord % cell) % id
       else
         rgb = 0
         id = -1
diff --git a/src/plot_header.F90 b/src/plot_header.F90
index 68eb89a11a..7ce0aa4500 100644
--- a/src/plot_header.F90
+++ b/src/plot_header.F90
@@ -27,6 +27,7 @@ module plot_header
     integer :: basis                 ! direction of plot slice 
     integer :: pixels(3)             ! pixel width/height of plot slice
     integer :: meshlines_width       ! pixel width of meshlines
+    integer :: level                 ! universe depth to plot the cells of
     type(StructuredMesh), pointer :: meshlines_mesh => null() ! mesh to plot
     type(ObjectColor) :: meshlines_color ! Color for meshlines
     type(ObjectColor) :: not_found   ! color for positions where no cell found
@@ -36,6 +37,9 @@ module plot_header
   ! Plot type
   integer, parameter :: PLOT_TYPE_SLICE = 1
   integer, parameter :: PLOT_TYPE_VOXEL = 2
+  
+  ! Plot level
+  integer, parameter :: PLOT_LEVEL_LOWEST = -1
 
   ! Plot basis plane
   integer, parameter :: PLOT_BASIS_XY = 1