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

[luis at geodynamics.org]

Author: luis
Date: 2008-10-15 10:12:58 -0700 (Wed, 15 Oct 2008)
New Revision: 13076

Modified:
   cs/cigma/trunk/src/NodeCoordinates.cpp
   cs/cigma/trunk/src/NodeCoordinates.h
Log:
Clean up commented out code in cigma::NodeCoordinates

Modified: cs/cigma/trunk/src/NodeCoordinates.cpp
===================================================================
--- cs/cigma/trunk/src/NodeCoordinates.cpp	2008-10-15 17:12:57 UTC (rev 13075)
+++ cs/cigma/trunk/src/NodeCoordinates.cpp	2008-10-15 17:12:58 UTC (rev 13076)
@@ -8,41 +8,10 @@
 NodeCoordinates::NodeCoordinates()
 {
     //std::cout << "Calling NodeCoordinates()" << std::endl;
-
-    // XXX: don't do this..use virtual functions
-    /*
-    nno = 0;
-    nsd = 0;
-    coords = 0;
-    */
 }
 
 NodeCoordinates::~NodeCoordinates()
 {
     //std::cout << "Calling ~NodeCoordinates()" << std::endl;
-    /*
-    if (coords != 0)
-    {
-        delete [] coords;
-        coords = 0;
-    }
-    */
 }
 
-// ----------------------------------------------------------------------------
-
-/*
-void NodeCoordinates::setCoordinates(double *coords, int nno, int nsd)
-{
-    this->nno = nno;
-    this->nsd = nsd;
-    if (this->coords)
-    {
-        delete [] this->coords;
-    }
-    this->coords = coords;
-}
-*/
-
-// ----------------------------------------------------------------------------
-

Modified: cs/cigma/trunk/src/NodeCoordinates.h
===================================================================
--- cs/cigma/trunk/src/NodeCoordinates.h	2008-10-15 17:12:57 UTC (rev 13075)
+++ cs/cigma/trunk/src/NodeCoordinates.h	2008-10-15 17:12:58 UTC (rev 13076)
@@ -17,6 +17,7 @@
     virtual ~NodeCoordinates();
 
     virtual void setCoordinates(double *coords, int nno, int nsd) = 0;
+    virtual void setCoordinates(float *coords, int nno, int nsd) = 0;
 
     virtual int n_points() const = 0;
     virtual int n_dim() const = 0;
@@ -24,27 +25,7 @@
     virtual double getPoint(int i, int j) const = 0;
     virtual double* getPointOffset(int i) = 0;
 
-    /* XXX: add locator */
-
-/*
-public:
-    int nno;    // XXX: Get rid of these...use pure virtual functions (cf. cigma::Cell)
-    int nsd;
-    double *coords;
-*/
+    /* XXX: add locator interface */
 };
 
-// ----------------------------------------------------------------------------
-
-/*
-inline int cigma::NodeCoordinates::n_points() const { return nno; }
-inline int cigma::NodeCoordinates::n_dim() const { return nsd; }
-
-inline double cigma::NodeCoordinates::getPoint(int i, int j) const { return coords[i*nsd + j]; }
-inline double * cigma::NodeCoordinates::getPointOffset(int i) { return &coords[i*nsd]; }
-*/
-
-
-// ----------------------------------------------------------------------------
-
 #endif