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

[luis at geodynamics.org]

Author: luis
Date: 2008-04-08 17:35:22 -0700 (Tue, 08 Apr 2008)
New Revision: 11773

Modified:
   cs/benchmark/cigma/trunk/src/GaleBenchmarkFields.cpp
   cs/benchmark/cigma/trunk/src/GaleBenchmarkFields.h
Log:
Inherit from UserField


Modified: cs/benchmark/cigma/trunk/src/GaleBenchmarkFields.cpp
===================================================================
--- cs/benchmark/cigma/trunk/src/GaleBenchmarkFields.cpp	2008-04-09 00:35:21 UTC (rev 11772)
+++ cs/benchmark/cigma/trunk/src/GaleBenchmarkFields.cpp	2008-04-09 00:35:22 UTC (rev 11773)
@@ -1,11 +1,19 @@
 #include <cmath>
+#include <iostream>
+#include <typeinfo>
 #include "GaleBenchmarkFields.h"
 
 using namespace gale::circular_inclusion;
 
-Pressure::Pressure() {}
-Pressure::~Pressure() {}
+Pressure::Pressure()
+{
+    //std::cout << "Creating instance of class " << typeid(this).name() << std::endl;
+}
 
+Pressure::~Pressure()
+{
+}
+
 bool Pressure::eval(double *x, double *value)
 {
     const double R = 0.05;

Modified: cs/benchmark/cigma/trunk/src/GaleBenchmarkFields.h
===================================================================
--- cs/benchmark/cigma/trunk/src/GaleBenchmarkFields.h	2008-04-09 00:35:21 UTC (rev 11772)
+++ cs/benchmark/cigma/trunk/src/GaleBenchmarkFields.h	2008-04-09 00:35:22 UTC (rev 11773)
@@ -1,7 +1,7 @@
 #ifndef __GaleBenchmarkFields_h__
 #define __GaleBenchmarkFields_h__
 
-#include "Field.h"
+#include "UserField.h"
 
 namespace gale
 {
@@ -11,7 +11,7 @@
     }
 }
 
-class gale::circular_inclusion::Pressure : public cigma::Field
+class gale::circular_inclusion::Pressure : public cigma::UserField
 {
 public:
     Pressure();
@@ -20,7 +20,6 @@
 public:
     int n_dim() { return 2; }
     int n_rank() { return 1; }
-    FieldType getType() { return USER_FIELD; }
 
 public:
     bool eval(double *x, double *value);