From bc513075acc9cff578fe3c0ecdb92239f9adb2a0 Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Tue, 30 Jun 2015 08:24:20 +0700
Subject: [PATCH] Make a few name arguments in type checks more descriptive.

---
 openmc/cmfd.py    | 14 +++++++-------
 openmc/element.py |  6 +-----
 openmc/filter.py  |  7 +++----
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/openmc/cmfd.py b/openmc/cmfd.py
index ea6e2e5e9f..76a44aba33 100644
--- a/openmc/cmfd.py
+++ b/openmc/cmfd.py
@@ -346,7 +346,7 @@ class CMFDFile(object):
 
     @dhat_reset.setter
     def dhat_reset(self, dhat_reset):
-        check_type('Dhat reset', dhat_reset, bool)
+        check_type('CMFD Dhat reset', dhat_reset, bool)
         self._dhat_reset = dhat_reset
 
     @display.setter
@@ -358,7 +358,7 @@ class CMFDFile(object):
 
     @downscatter.setter
     def downscatter(self, downscatter):
-        check_type('downscatter', downscatter, bool)
+        check_type('CMFD downscatter', downscatter, bool)
         self._downscatter = downscatter
 
     @feedback.setter
@@ -368,14 +368,14 @@ class CMFDFile(object):
 
     @gauss_seidel_tolerance.setter
     def gauss_seidel_tolerance(self, gauss_seidel_tolerance):
-        check_type('Gauss-Seidel tolerance', gauss_seidel_tolerance,
+        check_type('CMFD Gauss-Seidel tolerance', gauss_seidel_tolerance,
                    Iterable, Real)
         check_length('Gauss-Seidel tolerance', gauss_seidel_tolerance, 2)
         self._gauss_seidel_tolerance = gauss_seidel_tolerance
 
     @ktol.setter
     def ktol(self, ktol):
-        check_type('eigenvalue tolerance', ktol, Real)
+        check_type('CMFD eigenvalue tolerance', ktol, Real)
         self._ktol = ktol
 
     @cmfd_mesh.setter
@@ -400,17 +400,17 @@ class CMFDFile(object):
 
     @shift.setter
     def shift(self, shift):
-        check_type('Wielandt shift', shift, Real)
+        check_type('CMFD Wielandt shift', shift, Real)
         self._shift = shift
 
     @spectral.setter
     def spectral(self, spectral):
-        check_type('spectral radius', spectral, Real)
+        check_type('CMFD spectral radius', spectral, Real)
         self._spectral = spectral
 
     @stol.setter
     def stol(self, stol):
-        check_type('fission source tolerance', stol, Real)
+        check_type('CMFD fission source tolerance', stol, Real)
         self._stol = stol
 
     @tally_reset.setter
diff --git a/openmc/element.py b/openmc/element.py
index 85cb4a6558..2f81b9f308 100644
--- a/openmc/element.py
+++ b/openmc/element.py
@@ -69,11 +69,7 @@ class Element(object):
 
     @name.setter
     def name(self, name):
-        if not isinstance(name, basestring):
-            msg = 'Unable to set name for Element with a non-string ' \
-                        'value {0}'.format(name)
-            raise ValueError(msg)
-
+        check_type('name', name, basestring)
         self._name = name
 
     def __repr__(self):
diff --git a/openmc/filter.py b/openmc/filter.py
index caca9e2562..09928e235a 100644
--- a/openmc/filter.py
+++ b/openmc/filter.py
@@ -195,7 +195,7 @@ class Filter(object):
 
     @mesh.setter
     def mesh(self, mesh):
-        check_type('mesh', mesh, Mesh)
+        check_type('filter mesh', mesh, Mesh)
 
         self._mesh = mesh
         self.type = 'mesh'
@@ -203,13 +203,12 @@ class Filter(object):
 
     @offset.setter
     def offset(self, offset):
-        check_type('offset', offset, Integral)
-
+        check_type('filter offset', offset, Integral)
         self._offset = offset
 
     @stride.setter
     def stride(self, stride):
-        check_type('stride', stride, Integral)
+        check_type('filter stride', stride, Integral)
         if stride < 0:
             msg = 'Unable to set stride "{0}" for a {1} Filter since it is a ' \
                   'negative value'.format(stride, self._type)