From de6573300930e7e3a1a69d6e05bbf2b2c4b4f4ee Mon Sep 17 00:00:00 2001
From: Adam Nelson <nelsonag@umich.edu>
Date: Thu, 10 Mar 2016 19:54:42 -0500
Subject: [PATCH] Fixed the problem identified by @wbinventor in issue #608.

---
 docs/source/usersguide/input.rst |  8 ++++
 src/input_xml.F90                | 64 +++++++++++++++++---------------
 2 files changed, 42 insertions(+), 30 deletions(-)

diff --git a/docs/source/usersguide/input.rst b/docs/source/usersguide/input.rst
index eb620b650..2158e1d8c 100644
--- a/docs/source/usersguide/input.rst
+++ b/docs/source/usersguide/input.rst
@@ -1258,6 +1258,9 @@ Each ``material`` element can have the following attributes or sub-elements:
 
     *Default*: None
 
+    .. note:: The ``scattering`` attribute/sub-element is not used in the
+              multi-group :ref:`energy_mode`.
+
   :element:
 
     Specifies that a natural element is present in the material. The natural
@@ -1293,6 +1296,9 @@ Each ``material`` element can have the following attributes or sub-elements:
 
     *Default*: None
 
+    .. note:: The ``scattering`` attribute/sub-element is not used in the
+              multi-group :ref:`energy_mode`.
+
   :sab:
     Associates an S(a,b) table with the material. This element has
     attributes/sub-elements called ``name`` and ``xs``. The ``name`` attribute
@@ -1301,6 +1307,8 @@ Each ``material`` element can have the following attributes or sub-elements:
 
     *Default*: None
 
+    .. note:: This element is not used in the multi-group :ref:`energy_mode`.
+
   :macroscopic:
     The ``macroscopic`` element is similar to the ``nuclide`` element, but,
     recognizes that some multi-group libraries may be providing material
diff --git a/src/input_xml.F90 b/src/input_xml.F90
index 47b0aaacf..295422533 100644
--- a/src/input_xml.F90
+++ b/src/input_xml.F90
@@ -2098,21 +2098,6 @@ contains
           end if
         end if
 
-        ! Check enforced isotropic lab scattering
-        if (check_for_node(node_nuc, "scattering")) then
-          call get_node_value(node_nuc, "scattering", temp_str)
-          if (adjustl(to_lower(temp_str)) == "iso-in-lab") then
-            call list_iso_lab % append(1)
-          else if (adjustl(to_lower(temp_str)) == "data") then
-            call list_iso_lab % append(0)
-          else
-            call fatal_error("Scattering must be isotropic in lab or follow&
-                 & the ACE file data")
-          end if
-        else
-          call list_iso_lab % append(0)
-        end if
-
         ! store full name
         call get_node_value(node_nuc, "name", temp_str)
         if (check_for_node(node_nuc, "xs")) &
@@ -2157,6 +2142,23 @@ contains
             end if
           end if
 
+          ! Check enforced isotropic lab scattering
+          if (run_CE) then
+            if (check_for_node(node_nuc, "scattering")) then
+              call get_node_value(node_nuc, "scattering", temp_str)
+              if (adjustl(to_lower(temp_str)) == "iso-in-lab") then
+                call list_iso_lab % append(1)
+              else if (adjustl(to_lower(temp_str)) == "data") then
+                call list_iso_lab % append(0)
+              else
+                call fatal_error("Scattering must be isotropic in lab or follow&
+                     & the ACE file data")
+              end if
+            else
+              call list_iso_lab % append(0)
+            end if
+          end if
+
           ! store full name
           call get_node_value(node_nuc, "name", temp_str)
           if (check_for_node(node_nuc, "xs")) &
@@ -2251,23 +2253,25 @@ contains
         n_nuc_ele = list_names % size() - n_nuc_ele
 
         ! Check enforced isotropic lab scattering
-        if (check_for_node(node_ele, "scattering")) then
-          call get_node_value(node_ele, "scattering", temp_str)
-        else
-          temp_str = "data"
-        end if
-
-        ! Set ace or iso-in-lab scattering for each nuclide in element
-        do k = 1, n_nuc_ele
-          if (adjustl(to_lower(temp_str)) == "iso-in-lab") then
-            call list_iso_lab % append(1)
-          else if (adjustl(to_lower(temp_str)) == "data") then
-            call list_iso_lab % append(0)
+        if (run_CE) then
+          if (check_for_node(node_ele, "scattering")) then
+            call get_node_value(node_ele, "scattering", temp_str)
           else
-            call fatal_error("Scattering must be isotropic in lab or follow&
-                 & the ACE file data")
+            temp_str = "data"
           end if
-        end do
+
+          ! Set ace or iso-in-lab scattering for each nuclide in element
+          do k = 1, n_nuc_ele
+            if (adjustl(to_lower(temp_str)) == "iso-in-lab") then
+              call list_iso_lab % append(1)
+            else if (adjustl(to_lower(temp_str)) == "data") then
+              call list_iso_lab % append(0)
+            else
+              call fatal_error("Scattering must be isotropic in lab or follow&
+                   & the ACE file data")
+            end if
+          end do
+        end if
 
       end do NATURAL_ELEMENTS