From a146287a6de7ea3dfdd88a6c90ad07bfd1ea2ecd Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Fri, 30 Oct 2015 14:31:47 -0500
Subject: [PATCH] Changes surfaces="..." to region="..."

---
 mc-performance/openmc/geometry.xml            | 56 +++++++++----------
 .../benchmark-1/openmc/geometry.xml           | 48 ++++++++--------
 .../benchmark-2/openmc/case1_1/geometry.xml   | 30 +++++-----
 .../benchmark-2/openmc/case1_2/geometry.xml   | 30 +++++-----
 .../benchmark-2/openmc/case1_3/geometry.xml   | 30 +++++-----
 .../benchmark-2/openmc/case2_1/geometry.xml   | 30 +++++-----
 .../benchmark-2/openmc/case2_2/geometry.xml   | 30 +++++-----
 .../benchmark-2/openmc/case2_3/geometry.xml   | 30 +++++-----
 8 files changed, 142 insertions(+), 142 deletions(-)

diff --git a/mc-performance/openmc/geometry.xml b/mc-performance/openmc/geometry.xml
index 66b9917..f32e5eb 100644
--- a/mc-performance/openmc/geometry.xml
+++ b/mc-performance/openmc/geometry.xml
@@ -21,50 +21,50 @@
   <surface id="39" type="z-plane" coeffs="223.0" boundary="vacuum" />
 
   <!-- All geometry on base universe -->
-  <cell id="1"  fill="200"    surfaces="  -6 34 -35" /> <!-- Lower core -->
-  <cell id="2"  fill="201"    surfaces="  -6 35 -36" /> <!-- Upper core -->
-  <cell id="3"  material="8"  surfaces="  -7 31 -32" /> <!-- Lower core plate region -->
-  <cell id="4"  material="9"  surfaces="  -5 32 -33" /> <!-- Bottom nozzle region -->
-  <cell id="5"  material="12" surfaces="  -5 33 -34" /> <!-- Bottom FA region -->
-  <cell id="6"  material="11" surfaces="  -5 36 -37" /> <!-- Top FA region -->
-  <cell id="7"  material="10" surfaces="  -5 37 -38" /> <!-- Top nozzle region -->
-  <cell id="8"  material="7"  surfaces="  -7 38 -39" /> <!-- Upper plate region -->
-  <cell id="9"  material="3"  surfaces="6 -7 32 -38" /> <!-- Downcomer -->
-  <cell id="10" material="5"  surfaces="7 -8 31 -39" /> <!-- RPV -->
-  <cell id="11" material="6"  surfaces="5 -6 32 -34" /> <!-- Bottom of radial reflector -->
-  <cell id="12" material="7"  surfaces="5 -6 36 -38" /> <!-- Top of radial reflector -->
+  <cell id="1"  fill="200"    region="  -6 34 -35" /> <!-- Lower core -->
+  <cell id="2"  fill="201"    region="  -6 35 -36" /> <!-- Upper core -->
+  <cell id="3"  material="8"  region="  -7 31 -32" /> <!-- Lower core plate region -->
+  <cell id="4"  material="9"  region="  -5 32 -33" /> <!-- Bottom nozzle region -->
+  <cell id="5"  material="12" region="  -5 33 -34" /> <!-- Bottom FA region -->
+  <cell id="6"  material="11" region="  -5 36 -37" /> <!-- Top FA region -->
+  <cell id="7"  material="10" region="  -5 37 -38" /> <!-- Top nozzle region -->
+  <cell id="8"  material="7"  region="  -7 38 -39" /> <!-- Upper plate region -->
+  <cell id="9"  material="3"  region="6 -7 32 -38" /> <!-- Downcomer -->
+  <cell id="10" material="5"  region="7 -8 31 -39" /> <!-- RPV -->
+  <cell id="11" material="6"  region="5 -6 32 -34" /> <!-- Bottom of radial reflector -->
+  <cell id="12" material="7"  region="5 -6 36 -38" /> <!-- Top of radial reflector -->
 
   <!-- Fuel pin, cladding, cold water -->
-  <cell id="21" universe="1" material="1" surfaces="-1"   />
-  <cell id="22" universe="1" material="2" surfaces="1 -2" />
-  <cell id="23" universe="1" material="3" surfaces="2"    />
+  <cell id="21" universe="1" material="1" region="-1"   />
+  <cell id="22" universe="1" material="2" region="1 -2" />
+  <cell id="23" universe="1" material="3" region="2"    />
 
   <!-- Instrumentation guide tube -->
-  <cell id="24" universe="2" material="3" surfaces="-3"   />
-  <cell id="25" universe="2" material="2" surfaces="3 -4" />
-  <cell id="26" universe="2" material="3" surfaces="4"    />
+  <cell id="24" universe="2" material="3" region="-3"   />
+  <cell id="25" universe="2" material="2" region="3 -4" />
+  <cell id="26" universe="2" material="3" region="4"    />
 
   <!-- Fuel pin, cladding, hot water -->
-  <cell id="27" universe="3" material="1" surfaces="-1"   />
-  <cell id="28" universe="3" material="2" surfaces="1 -2" />
-  <cell id="29" universe="3" material="4" surfaces="2"    />
+  <cell id="27" universe="3" material="1" region="-1"   />
+  <cell id="28" universe="3" material="2" region="1 -2" />
+  <cell id="29" universe="3" material="4" region="2"    />
 
   <!-- Instrumentation guide tube -->
-  <cell id="30" universe="4" material="4" surfaces="-3"   />
-  <cell id="31" universe="4" material="2" surfaces="3 -4" />
-  <cell id="32" universe="4" material="4" surfaces="4"    />
+  <cell id="30" universe="4" material="4" region="-3"   />
+  <cell id="31" universe="4" material="2" region="3 -4" />
+  <cell id="32" universe="4" material="4" region="4"    />
 
   <!-- cell for water assembly (cold) -->
-  <cell id="50" universe="5" material="3" surfaces="34 -35" />
+  <cell id="50" universe="5" material="3" region="34 -35" />
 
   <!-- containing cell for fuel assembly -->
-  <cell id="60" universe="6" fill="100"   surfaces="34 -35" />
+  <cell id="60" universe="6" fill="100"   region="34 -35" />
 
   <!-- cell for water assembly (hot) -->
-  <cell id="70" universe="7" material="4" surfaces="35 -36" />
+  <cell id="70" universe="7" material="4" region="35 -36" />
 
   <!-- containing cell for fuel assembly -->
-  <cell id="80" universe="8" fill="101"   surfaces="35 -36" />
+  <cell id="80" universe="8" fill="101"   region="35 -36" />
 
   <!-- Fuel Assembly (Lower Half) -->
   <lattice id="100">
diff --git a/source-convergence/benchmark-1/openmc/geometry.xml b/source-convergence/benchmark-1/openmc/geometry.xml
index f53e720..0f7f157 100644
--- a/source-convergence/benchmark-1/openmc/geometry.xml
+++ b/source-convergence/benchmark-1/openmc/geometry.xml
@@ -42,36 +42,36 @@
   <surface id="63" type="z-plane" coeffs="390." boundary="vacuum" />
 
   <!-- pin cell in water -->
-  <cell id="1" universe="3" material="1" surfaces="   -10" />
-  <cell id="2" universe="3" material="2" surfaces="10 -11" />
-  <cell id="3" universe="3" material="3" surfaces="11"     />
+  <cell id="1" universe="3" material="1" region="   -10" />
+  <cell id="2" universe="3" material="2" region="10 -11" />
+  <cell id="3" universe="3" material="3" region="11"     />
 
   <!-- water assembly -->
-  <cell id="10" universe="1" material="4" surfaces="   -20       " /> <!-- box -->
-  <cell id="11" universe="1" material="4" surfaces="20 -23    -30" /> <!-- box -->
-  <cell id="12" universe="1" material="3" surfaces="20 -23 30 -33" /> <!-- water -->
-  <cell id="13" universe="1" material="4" surfaces="20 -23 33    " /> <!-- box -->
-  <cell id="14" universe="1" material="4" surfaces="23           " /> <!-- box -->
+  <cell id="10" universe="1" material="4" region="   -20       " /> <!-- box -->
+  <cell id="11" universe="1" material="4" region="20 -23    -30" /> <!-- box -->
+  <cell id="12" universe="1" material="3" region="20 -23 30 -33" /> <!-- water -->
+  <cell id="13" universe="1" material="4" region="20 -23 33    " /> <!-- box -->
+  <cell id="14" universe="1" material="4" region="23           " /> <!-- box -->
 
   <!-- fuel assembly -->
-  <cell id="20" universe="2" material="4" surfaces="   -20       " /> <!-- box -->
-  <cell id="21" universe="2" material="4" surfaces="20 -23    -30" /> <!-- box -->
-  <cell id="22" universe="2" material="3" surfaces="20 -23 30 -31" /> <!-- water -->
-  <cell id="23" universe="2" material="3" surfaces="20 -21 31 -32" /> <!-- water -->
-  <cell id="24" universe="2" fill="200"   surfaces="21 -22 31 -32" /> <!-- fuel -->
-  <cell id="25" universe="2" material="3" surfaces="22 -23 31 -32" /> <!-- water -->
-  <cell id="26" universe="2" material="3" surfaces="20 -23 32 -33" /> <!-- water -->
-  <cell id="27" universe="2" material="4" surfaces="20 -23 33    " /> <!-- box -->
-  <cell id="28" universe="2" material="4" surfaces="23           " /> <!-- box -->
+  <cell id="20" universe="2" material="4" region="   -20       " /> <!-- box -->
+  <cell id="21" universe="2" material="4" region="20 -23    -30" /> <!-- box -->
+  <cell id="22" universe="2" material="3" region="20 -23 30 -31" /> <!-- water -->
+  <cell id="23" universe="2" material="3" region="20 -21 31 -32" /> <!-- water -->
+  <cell id="24" universe="2" fill="200"   region="21 -22 31 -32" /> <!-- fuel -->
+  <cell id="25" universe="2" material="3" region="22 -23 31 -32" /> <!-- water -->
+  <cell id="26" universe="2" material="3" region="20 -23 32 -33" /> <!-- water -->
+  <cell id="27" universe="2" material="4" region="20 -23 33    " /> <!-- box -->
+  <cell id="28" universe="2" material="4" region="23           " /> <!-- box -->
 
   <!-- checkerboard and surrounding materials -->
-  <cell id="31" material="5" surfaces="40 -41 50 -53 60 -63" /> <!-- left concrete -->
-  <cell id="32" material="3" surfaces="41 -42 50 -51 60 -63" /> <!-- bottom water (x,y plane) -->
-  <cell id="33" material="3" surfaces="41 -42 51 -52 60 -61" /> <!-- bottom water (y,x plane) -->
-  <cell id="34" fill="100"   surfaces="41 -42 51 -52 61 -62" /> <!-- checkerboard -->
-  <cell id="35" material="3" surfaces="41 -42 51 -52 62 -63" /> <!-- top water (y,x plane) -->
-  <cell id="36" material="5" surfaces="41 -42 52 -53 60 -63" /> <!-- top concrete -->
-  <cell id="37" material="5" surfaces="42 -43 50 -53 60 -63" /> <!-- right concrete -->
+  <cell id="31" material="5" region="40 -41 50 -53 60 -63" /> <!-- left concrete -->
+  <cell id="32" material="3" region="41 -42 50 -51 60 -63" /> <!-- bottom water (x,y plane) -->
+  <cell id="33" material="3" region="41 -42 51 -52 60 -61" /> <!-- bottom water (y,x plane) -->
+  <cell id="34" fill="100"   region="41 -42 51 -52 61 -62" /> <!-- checkerboard -->
+  <cell id="35" material="3" region="41 -42 51 -52 62 -63" /> <!-- top water (y,x plane) -->
+  <cell id="36" material="5" region="41 -42 52 -53 60 -63" /> <!-- top concrete -->
+  <cell id="37" material="5" region="42 -43 50 -53 60 -63" /> <!-- right concrete -->
 
   <lattice id="200" type="rectangular" dimension="15 15" lower_left="-10.5 -10.5" width="1.4 1.4">
     <universes>
diff --git a/source-convergence/benchmark-2/openmc/case1_1/geometry.xml b/source-convergence/benchmark-2/openmc/case1_1/geometry.xml
index 9885bb0..bc6956b 100644
--- a/source-convergence/benchmark-2/openmc/case1_1/geometry.xml
+++ b/source-convergence/benchmark-2/openmc/case1_1/geometry.xml
@@ -34,24 +34,24 @@
   <surface id="23" type="y-plane" coeffs="0.665"  boundary="reflective" />
 
   <!-- Surrounding water -->
-  <cell id="1" material="1" surfaces="20 -21 22 -23 3   -4"    />
-  <cell id="2" material="1" surfaces="20 -21 22 -23 4  -15  2" />
-  <cell id="3" material="1" surfaces="20 -21 22 -23 15 -16"  />
+  <cell id="1" material="1" region="20 -21 22 -23 3   -4"    />
+  <cell id="2" material="1" region="20 -21 22 -23 4  -15  2" />
+  <cell id="3" material="1" region="20 -21 22 -23 15 -16"  />
 
   <!-- Cladding, end plugs -->
-  <cell id="4" material="2" surfaces="  -2 4  -5"  />
-  <cell id="5" material="2" surfaces="1 -2 5  -14" />
-  <cell id="6" material="2" surfaces="  -2 14 -15" />
+  <cell id="4" material="2" region="  -2 4  -5"  />
+  <cell id="5" material="2" region="1 -2 5  -14" />
+  <cell id="6" material="2" region="  -2 14 -15" />
 
   <!-- Fuel regions 9->1 -->
-  <cell id="7"  material="3" surfaces="-1  5 -6"  />
-  <cell id="8"  material="3" surfaces="-1  6 -7"  />
-  <cell id="9"  material="3" surfaces="-1  7 -8"  />
-  <cell id="10" material="3" surfaces="-1  8 -9"  />
-  <cell id="11" material="5" surfaces="-1  9 -10" />
-  <cell id="12" material="3" surfaces="-1 10 -11" />
-  <cell id="13" material="3" surfaces="-1 11 -12" />
-  <cell id="14" material="3" surfaces="-1 12 -13" />
-  <cell id="15" material="3" surfaces="-1 13 -14" />
+  <cell id="7"  material="3" region="-1  5 -6"  />
+  <cell id="8"  material="3" region="-1  6 -7"  />
+  <cell id="9"  material="3" region="-1  7 -8"  />
+  <cell id="10" material="3" region="-1  8 -9"  />
+  <cell id="11" material="5" region="-1  9 -10" />
+  <cell id="12" material="3" region="-1 10 -11" />
+  <cell id="13" material="3" region="-1 11 -12" />
+  <cell id="14" material="3" region="-1 12 -13" />
+  <cell id="15" material="3" region="-1 13 -14" />
 
 </geometry>
diff --git a/source-convergence/benchmark-2/openmc/case1_2/geometry.xml b/source-convergence/benchmark-2/openmc/case1_2/geometry.xml
index a0ebf3d..f998951 100644
--- a/source-convergence/benchmark-2/openmc/case1_2/geometry.xml
+++ b/source-convergence/benchmark-2/openmc/case1_2/geometry.xml
@@ -34,24 +34,24 @@
   <surface id="23" type="y-plane" coeffs="0.665"  boundary="reflective" />
 
   <!-- Surrounding water -->
-  <cell id="1" material="1" surfaces="20 -21 22 -23 3   -4"    />
-  <cell id="2" material="1" surfaces="20 -21 22 -23 4  -15  2" />
-  <cell id="3" material="1" surfaces="20 -21 22 -23 15 -16"  />
+  <cell id="1" material="1" region="20 -21 22 -23 3   -4"    />
+  <cell id="2" material="1" region="20 -21 22 -23 4  -15  2" />
+  <cell id="3" material="1" region="20 -21 22 -23 15 -16"  />
 
   <!-- Cladding, end plugs -->
-  <cell id="4" material="2" surfaces="  -2 4  -5"  />
-  <cell id="5" material="2" surfaces="1 -2 5  -14" />
-  <cell id="6" material="2" surfaces="  -2 14 -15" />
+  <cell id="4" material="2" region="  -2 4  -5"  />
+  <cell id="5" material="2" region="1 -2 5  -14" />
+  <cell id="6" material="2" region="  -2 14 -15" />
 
   <!-- Fuel regions 9->1 -->
-  <cell id="7"  material="4" surfaces="-1  5 -6"  />
-  <cell id="8"  material="4" surfaces="-1  6 -7"  />
-  <cell id="9"  material="4" surfaces="-1  7 -8"  />
-  <cell id="10" material="4" surfaces="-1  8 -9"  />
-  <cell id="11" material="5" surfaces="-1  9 -10" />
-  <cell id="12" material="3" surfaces="-1 10 -11" />
-  <cell id="13" material="3" surfaces="-1 11 -12" />
-  <cell id="14" material="3" surfaces="-1 12 -13" />
-  <cell id="15" material="3" surfaces="-1 13 -14" />
+  <cell id="7"  material="4" region="-1  5 -6"  />
+  <cell id="8"  material="4" region="-1  6 -7"  />
+  <cell id="9"  material="4" region="-1  7 -8"  />
+  <cell id="10" material="4" region="-1  8 -9"  />
+  <cell id="11" material="5" region="-1  9 -10" />
+  <cell id="12" material="3" region="-1 10 -11" />
+  <cell id="13" material="3" region="-1 11 -12" />
+  <cell id="14" material="3" region="-1 12 -13" />
+  <cell id="15" material="3" region="-1 13 -14" />
 
 </geometry>
diff --git a/source-convergence/benchmark-2/openmc/case1_3/geometry.xml b/source-convergence/benchmark-2/openmc/case1_3/geometry.xml
index dfa4f5f..38e2d17 100644
--- a/source-convergence/benchmark-2/openmc/case1_3/geometry.xml
+++ b/source-convergence/benchmark-2/openmc/case1_3/geometry.xml
@@ -34,24 +34,24 @@
   <surface id="23" type="y-plane" coeffs="0.665"  boundary="reflective" />
 
   <!-- Surrounding water -->
-  <cell id="1" material="1" surfaces="20 -21 22 -23 3   -4"    />
-  <cell id="2" material="1" surfaces="20 -21 22 -23 4  -15  2" />
-  <cell id="3" material="1" surfaces="20 -21 22 -23 15 -16"  />
+  <cell id="1" material="1" region="20 -21 22 -23 3   -4"    />
+  <cell id="2" material="1" region="20 -21 22 -23 4  -15  2" />
+  <cell id="3" material="1" region="20 -21 22 -23 15 -16"  />
 
   <!-- Cladding, end plugs -->
-  <cell id="4" material="2" surfaces="  -2 4  -5"  />
-  <cell id="5" material="2" surfaces="1 -2 5  -14" />
-  <cell id="6" material="2" surfaces="  -2 14 -15" />
+  <cell id="4" material="2" region="  -2 4  -5"  />
+  <cell id="5" material="2" region="1 -2 5  -14" />
+  <cell id="6" material="2" region="  -2 14 -15" />
 
   <!-- Fuel regions 9->1 -->
-  <cell id="7"  material="4" surfaces="-1  5 -6"  />
-  <cell id="8"  material="4" surfaces="-1  6 -7"  />
-  <cell id="9"  material="3" surfaces="-1  7 -8"  />
-  <cell id="10" material="3" surfaces="-1  8 -9"  />
-  <cell id="11" material="5" surfaces="-1  9 -10" />
-  <cell id="12" material="3" surfaces="-1 10 -11" />
-  <cell id="13" material="3" surfaces="-1 11 -12" />
-  <cell id="14" material="3" surfaces="-1 12 -13" />
-  <cell id="15" material="3" surfaces="-1 13 -14" />
+  <cell id="7"  material="4" region="-1  5 -6"  />
+  <cell id="8"  material="4" region="-1  6 -7"  />
+  <cell id="9"  material="3" region="-1  7 -8"  />
+  <cell id="10" material="3" region="-1  8 -9"  />
+  <cell id="11" material="5" region="-1  9 -10" />
+  <cell id="12" material="3" region="-1 10 -11" />
+  <cell id="13" material="3" region="-1 11 -12" />
+  <cell id="14" material="3" region="-1 12 -13" />
+  <cell id="15" material="3" region="-1 13 -14" />
 
 </geometry>
diff --git a/source-convergence/benchmark-2/openmc/case2_1/geometry.xml b/source-convergence/benchmark-2/openmc/case2_1/geometry.xml
index 2b96cd7..a451f57 100644
--- a/source-convergence/benchmark-2/openmc/case2_1/geometry.xml
+++ b/source-convergence/benchmark-2/openmc/case2_1/geometry.xml
@@ -34,24 +34,24 @@
   <surface id="23" type="y-plane" coeffs="0.665"  boundary="reflective" />
 
   <!-- Surrounding water -->
-  <cell id="1" material="1" surfaces="20 -21 22 -23 3   -4"    />
-  <cell id="2" material="1" surfaces="20 -21 22 -23 4  -15  2" />
-  <cell id="3" material="1" surfaces="20 -21 22 -23 15 -16"  />
+  <cell id="1" material="1" region="20 -21 22 -23 3   -4"    />
+  <cell id="2" material="1" region="20 -21 22 -23 4  -15  2" />
+  <cell id="3" material="1" region="20 -21 22 -23 15 -16"  />
 
   <!-- Cladding, end plugs -->
-  <cell id="4" material="2" surfaces="  -2 4  -5"  />
-  <cell id="5" material="2" surfaces="1 -2 5  -14" />
-  <cell id="6" material="2" surfaces="  -2 14 -15" />
+  <cell id="4" material="2" region="  -2 4  -5"  />
+  <cell id="5" material="2" region="1 -2 5  -14" />
+  <cell id="6" material="2" region="  -2 14 -15" />
 
   <!-- Fuel regions 9->1 -->
-  <cell id="7"  material="6"  surfaces="-1  5 -6"  />
-  <cell id="8"  material="7"  surfaces="-1  6 -7"  />
-  <cell id="9"  material="8"  surfaces="-1  7 -8"  />
-  <cell id="10" material="9"  surfaces="-1  8 -9"  />
-  <cell id="11" material="10" surfaces="-1  9 -10" />
-  <cell id="12" material="9"  surfaces="-1 10 -11" />
-  <cell id="13" material="8"  surfaces="-1 11 -12" />
-  <cell id="14" material="7"  surfaces="-1 12 -13" />
-  <cell id="15" material="6"  surfaces="-1 13 -14" />
+  <cell id="7"  material="6"  region="-1  5 -6"  />
+  <cell id="8"  material="7"  region="-1  6 -7"  />
+  <cell id="9"  material="8"  region="-1  7 -8"  />
+  <cell id="10" material="9"  region="-1  8 -9"  />
+  <cell id="11" material="10" region="-1  9 -10" />
+  <cell id="12" material="9"  region="-1 10 -11" />
+  <cell id="13" material="8"  region="-1 11 -12" />
+  <cell id="14" material="7"  region="-1 12 -13" />
+  <cell id="15" material="6"  region="-1 13 -14" />
 
 </geometry>
diff --git a/source-convergence/benchmark-2/openmc/case2_2/geometry.xml b/source-convergence/benchmark-2/openmc/case2_2/geometry.xml
index 74d94bf..d4f9d75 100644
--- a/source-convergence/benchmark-2/openmc/case2_2/geometry.xml
+++ b/source-convergence/benchmark-2/openmc/case2_2/geometry.xml
@@ -34,24 +34,24 @@
   <surface id="23" type="y-plane" coeffs="0.665"  boundary="reflective" />
 
   <!-- Surrounding water -->
-  <cell id="1" material="1" surfaces="20 -21 22 -23 3   -4"    />
-  <cell id="2" material="1" surfaces="20 -21 22 -23 4  -15  2" />
-  <cell id="3" material="1" surfaces="20 -21 22 -23 15 -16"  />
+  <cell id="1" material="1" region="20 -21 22 -23 3   -4"    />
+  <cell id="2" material="1" region="20 -21 22 -23 4  -15  2" />
+  <cell id="3" material="1" region="20 -21 22 -23 15 -16"  />
 
   <!-- Cladding, end plugs -->
-  <cell id="4" material="2" surfaces="  -2 4  -5"  />
-  <cell id="5" material="2" surfaces="1 -2 5  -14" />
-  <cell id="6" material="2" surfaces="  -2 14 -15" />
+  <cell id="4" material="2" region="  -2 4  -5"  />
+  <cell id="5" material="2" region="1 -2 5  -14" />
+  <cell id="6" material="2" region="  -2 14 -15" />
 
   <!-- Fuel regions 9->1 -->
-  <cell id="7"  material="7"  surfaces="-1  5 -6"  />
-  <cell id="8"  material="8"  surfaces="-1  6 -7"  />
-  <cell id="9"  material="9"  surfaces="-1  7 -8"  />
-  <cell id="10" material="10" surfaces="-1  8 -9"  />
-  <cell id="11" material="10" surfaces="-1  9 -10" />
-  <cell id="12" material="9"  surfaces="-1 10 -11" />
-  <cell id="13" material="8"  surfaces="-1 11 -12" />
-  <cell id="14" material="7"  surfaces="-1 12 -13" />
-  <cell id="15" material="6"  surfaces="-1 13 -14" />
+  <cell id="7"  material="7"  region="-1  5 -6"  />
+  <cell id="8"  material="8"  region="-1  6 -7"  />
+  <cell id="9"  material="9"  region="-1  7 -8"  />
+  <cell id="10" material="10" region="-1  8 -9"  />
+  <cell id="11" material="10" region="-1  9 -10" />
+  <cell id="12" material="9"  region="-1 10 -11" />
+  <cell id="13" material="8"  region="-1 11 -12" />
+  <cell id="14" material="7"  region="-1 12 -13" />
+  <cell id="15" material="6"  region="-1 13 -14" />
 
 </geometry>
diff --git a/source-convergence/benchmark-2/openmc/case2_3/geometry.xml b/source-convergence/benchmark-2/openmc/case2_3/geometry.xml
index 1638c9c..aa1629a 100644
--- a/source-convergence/benchmark-2/openmc/case2_3/geometry.xml
+++ b/source-convergence/benchmark-2/openmc/case2_3/geometry.xml
@@ -34,24 +34,24 @@
   <surface id="23" type="y-plane" coeffs="0.665"  boundary="reflective" />
 
   <!-- Surrounding water -->
-  <cell id="1" material="1" surfaces="20 -21 22 -23 3   -4"    />
-  <cell id="2" material="1" surfaces="20 -21 22 -23 4  -15  2" />
-  <cell id="3" material="1" surfaces="20 -21 22 -23 15 -16"  />
+  <cell id="1" material="1" region="20 -21 22 -23 3   -4"    />
+  <cell id="2" material="1" region="20 -21 22 -23 4  -15  2" />
+  <cell id="3" material="1" region="20 -21 22 -23 15 -16"  />
 
   <!-- Cladding, end plugs -->
-  <cell id="4" material="2" surfaces="  -2 4  -5"  />
-  <cell id="5" material="2" surfaces="1 -2 5  -14" />
-  <cell id="6" material="2" surfaces="  -2 14 -15" />
+  <cell id="4" material="2" region="  -2 4  -5"  />
+  <cell id="5" material="2" region="1 -2 5  -14" />
+  <cell id="6" material="2" region="  -2 14 -15" />
 
   <!-- Fuel regions 9->1 -->
-  <cell id="7"  material="7"  surfaces="-1  5 -6"  />
-  <cell id="8"  material="8"  surfaces="-1  6 -7"  />
-  <cell id="9"  material="8"  surfaces="-1  7 -8"  />
-  <cell id="10" material="9"  surfaces="-1  8 -9"  />
-  <cell id="11" material="10" surfaces="-1  9 -10" />
-  <cell id="12" material="9"  surfaces="-1 10 -11" />
-  <cell id="13" material="8"  surfaces="-1 11 -12" />
-  <cell id="14" material="7"  surfaces="-1 12 -13" />
-  <cell id="15" material="6"  surfaces="-1 13 -14" />
+  <cell id="7"  material="7"  region="-1  5 -6"  />
+  <cell id="8"  material="8"  region="-1  6 -7"  />
+  <cell id="9"  material="8"  region="-1  7 -8"  />
+  <cell id="10" material="9"  region="-1  8 -9"  />
+  <cell id="11" material="10" region="-1  9 -10" />
+  <cell id="12" material="9"  region="-1 10 -11" />
+  <cell id="13" material="8"  region="-1 11 -12" />
+  <cell id="14" material="7"  region="-1 12 -13" />
+  <cell id="15" material="6"  region="-1 13 -14" />
 
 </geometry>