[cig-commits] r11714 - cs/benchmark/cigma/trunk/src

[luis at geodynamics.org]

Author: luis
Date: 2008-04-02 03:24:45 -0700 (Wed, 02 Apr 2008)
New Revision: 11714

Modified:
   cs/benchmark/cigma/trunk/src/ZeroField.cpp
   cs/benchmark/cigma/trunk/src/ZeroField.h
Log:
Inheritance needs to be public. Also moved code out of header file.


Modified: cs/benchmark/cigma/trunk/src/ZeroField.cpp
===================================================================
--- cs/benchmark/cigma/trunk/src/ZeroField.cpp	2008-04-02 10:24:44 UTC (rev 11713)
+++ cs/benchmark/cigma/trunk/src/ZeroField.cpp	2008-04-02 10:24:45 UTC (rev 11714)
@@ -13,6 +13,11 @@
 {
 }
 
+void ZeroField::set_shape(int dim, int rank)
+{
+    this->dim = dim;
+    this->rank = rank;
+}
 
 bool ZeroField::eval(double *x, double *y)
 {

Modified: cs/benchmark/cigma/trunk/src/ZeroField.h
===================================================================
--- cs/benchmark/cigma/trunk/src/ZeroField.h	2008-04-02 10:24:44 UTC (rev 11713)
+++ cs/benchmark/cigma/trunk/src/ZeroField.h	2008-04-02 10:24:45 UTC (rev 11714)
@@ -7,26 +7,20 @@
     class ZeroField;
 }
 
-class cigma::ZeroField : Field
+class cigma::ZeroField : public cigma::Field
 {
 public:
     ZeroField();
     ~ZeroField();
+    void set_shape(int dim, int rank);
 
 public:
-    bool eval(double *point, double *value);
-
-public:
     int n_dim() { return dim; }
     int n_rank() { return rank; }
     FieldType getType() { return USER_FIELD; }
 
 public:
-    void set_shape(int dim, int rank)
-    {
-        this->dim = dim;
-        this->rank = rank;
-    }
+    bool eval(double *point, double *value);
 
 public:
     int dim;