[cig-commits] [commit] baagaard/remove-1d: Fix. Remove 1-D stuff left behind. (dc231f8)

[cig_noreply at geodynamics.org]

Repository : ssh://geoshell/pylith

On branch  : baagaard/remove-1d
Link       : https://github.com/geodynamics/pylith/compare/23710a72a512d18142beccde21e924b80ce32d18...dc231f802ca59232e7b593c07305f68a70c2cfe3

>---------------------------------------------------------------

commit dc231f802ca59232e7b593c07305f68a70c2cfe3
Author: Brad Aagaard <baagaard at usgs.gov>
Date:   Wed Nov 6 14:08:53 2013 -0800

    Fix. Remove 1-D stuff left behind.


>---------------------------------------------------------------

dc231f802ca59232e7b593c07305f68a70c2cfe3
 libsrc/pylith/feassemble/CellGeometry.cc | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/libsrc/pylith/feassemble/CellGeometry.cc b/libsrc/pylith/feassemble/CellGeometry.cc
index 84d6507..746e17c 100644
--- a/libsrc/pylith/feassemble/CellGeometry.cc
+++ b/libsrc/pylith/feassemble/CellGeometry.cc
@@ -87,9 +87,6 @@ pylith::feassemble::CellGeometry::cellDim(void) const
   int dim = 0;
   switch (_shape)
     { // switch
-    case POINT :
-      dim = 0;
-      break;
     case LINE :
       dim = 1;
       break;
@@ -118,9 +115,6 @@ pylith::feassemble::CellGeometry::numCorners(void) const
   int corners = 0;
   switch (_shape)
     { // switch
-    case POINT :
-      corners = 1;
-      break;
     case LINE :
       corners = 2;
       break;
@@ -153,13 +147,8 @@ pylith::feassemble::CellGeometry::_setVertices(const PylithScalar* vertices,
 					       const int numVertices,
 					       const int dim)
 { // _setVertices
-  if (POINT != _shape) {
-    assert(numCorners() == numVertices);
-    assert(cellDim() == dim);
-  } else {
-    assert(1 == numVertices);
-    assert(1 == dim);
-  } // if/else
+  assert(numCorners() == numVertices);
+  assert(cellDim() == dim);
   const int nbytes = numVertices*dim*sizeof(PylithScalar);
   _vertices.resize(numVertices*dim);
   memcpy(&_vertices[0], vertices, nbytes);