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

[luis at geodynamics.org]

Author: luis
Date: 2007-12-19 12:06:46 -0800 (Wed, 19 Dec 2007)
New Revision: 8947

Modified:
   cs/benchmark/cigma/trunk/src/Field.cpp
   cs/benchmark/cigma/trunk/src/Field.h
Log:
Updated Field class with another virtual eval() method

Modified: cs/benchmark/cigma/trunk/src/Field.cpp
===================================================================
--- cs/benchmark/cigma/trunk/src/Field.cpp	2007-12-19 20:06:39 UTC (rev 8946)
+++ cs/benchmark/cigma/trunk/src/Field.cpp	2007-12-19 20:06:46 UTC (rev 8947)
@@ -1,3 +1,4 @@
+#include <cassert>
 #include "Field.h"
 
 cigma::Field::~Field() {};
@@ -2 +3,12 @@
 
+void cigma::Field::eval(Points &domain, Points &range)
+{
+    assert(domain.n_points() == range.n_points());
+    for (int i = 0; i < domain.n_points(); i++)
+    {
+        double *x = domain[i];
+        double *y = range[i];
+        eval(x,y);
+    }
+}
+

Modified: cs/benchmark/cigma/trunk/src/Field.h
===================================================================
--- cs/benchmark/cigma/trunk/src/Field.h	2007-12-19 20:06:39 UTC (rev 8946)
+++ cs/benchmark/cigma/trunk/src/Field.h	2007-12-19 20:06:46 UTC (rev 8947)
@@ -1,20 +1,27 @@
 #ifndef __FIELD_H__
 #define __FIELD_H__
 
+#include "Points.h"
+
+
 namespace cigma
 {
     class Field;
 }
 
-
-/*
- * Base Field object
+
+/**
+ * @brief Base Field object
  */
 class cigma::Field
 {
 public:
+    virtual int n_dim() = 0;
+    virtual int n_rank() = 0;
     virtual void eval(double *point, double *value) = 0;
+    virtual void eval(Points &domain, Points &range);
     virtual ~Field();
 };
 
+
 #endif