[cig-commits] r13159 - cs/cigma/trunk/src

[luis at geodynamics.org]

Author: luis
Date: 2008-10-29 15:11:17 -0700 (Wed, 29 Oct 2008)
New Revision: 13159

Modified:
   cs/cigma/trunk/src/ElementBlock.cpp
   cs/cigma/trunk/src/ElementBlock.h
Log:
Renamed method to &ElementBlock::getId

Modified: cs/cigma/trunk/src/ElementBlock.cpp
===================================================================
--- cs/cigma/trunk/src/ElementBlock.cpp	2008-10-29 22:11:15 UTC (rev 13158)
+++ cs/cigma/trunk/src/ElementBlock.cpp	2008-10-29 22:11:17 UTC (rev 13159)
@@ -1,19 +1,10 @@
-#include "ElementBlock.h"
 #include <iostream>
-
+#include "ElementBlock.h"
 using namespace cigma;
 
-// ----------------------------------------------------------------------------
-
 ElementBlock::ElementBlock()
 {
     //std::cout << "Calling ElementBlock()" << std::endl;
-
-    /*
-    // XXX: get rid of these -- use virtual functions
-    nel = 0;
-    ndofs = 0;
-    */
 }
 
 ElementBlock::~ElementBlock()
@@ -21,4 +12,3 @@
     //std::cout << "Calling ~ElementBlock()" << std::endl;
 }
 
-// ----------------------------------------------------------------------------

Modified: cs/cigma/trunk/src/ElementBlock.h
===================================================================
--- cs/cigma/trunk/src/ElementBlock.h	2008-10-29 22:11:15 UTC (rev 13158)
+++ cs/cigma/trunk/src/ElementBlock.h	2008-10-29 22:11:17 UTC (rev 13159)
@@ -1,6 +1,7 @@
 #ifndef __CIGMA_ELEMENT_BLOCK_H__
 #define __CIGMA_ELEMENT_BLOCK_H__
 
+#include "Common.h"
 #include <boost/noncopyable.hpp>
 
 namespace cigma
@@ -18,9 +19,8 @@
 
     virtual int n_cells() const = 0;
     virtual int n_dofs() const = 0;
+    virtual int getId(int e, int i) const = 0;
 
-    virtual int getCellNodeId(int e, int i) = 0;
-
     /* XXX: add locator instance here? */
     /* XXX: keep a reference to the parent cell? */
 };