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

[luis at geodynamics.org]

Author: luis
Date: 2008-03-24 09:27:08 -0700 (Mon, 24 Mar 2008)
New Revision: 11520

Modified:
   cs/benchmark/cigma/trunk/src/ExtField.cpp
   cs/benchmark/cigma/trunk/src/ExtField.h
Log:
Renamed the class ExternalField to ExtField


Modified: cs/benchmark/cigma/trunk/src/ExtField.cpp
===================================================================
--- cs/benchmark/cigma/trunk/src/ExtField.cpp	2008-03-24 16:27:06 UTC (rev 11519)
+++ cs/benchmark/cigma/trunk/src/ExtField.cpp	2008-03-24 16:27:08 UTC (rev 11520)
@@ -2,23 +2,25 @@
 #include <cstdlib>
 #include <dlfcn.h>
 #include <cassert>
-#include "ExternalField.h"
+#include "ExtField.h"
 
+using namespace cigma;
+
 // ---------------------------------------------------------------------------
 
-cigma::ExternalField::ExternalField()
+ExtField::ExtField()
 {
     handle = 0;
 }
 
-cigma::ExternalField::~ExternalField()
+ExtField::~ExtField()
 {
     close_library();
 }
 
 // ---------------------------------------------------------------------------
 
-void cigma::ExternalField::load_library(std::string filename, std::string prefix)
+void ExtField::load_library(std::string filename, std::string prefix)
 {
     std::string function_name;
     char *error;
@@ -78,11 +80,12 @@
     }
 }
 
-void cigma::ExternalField::close_library()
+void ExtField::close_library()
 {
     if (handle != 0)
     {
         dlclose(handle);
+        handle = 0;
     }
 }
 

Modified: cs/benchmark/cigma/trunk/src/ExtField.h
===================================================================
--- cs/benchmark/cigma/trunk/src/ExtField.h	2008-03-24 16:27:06 UTC (rev 11519)
+++ cs/benchmark/cigma/trunk/src/ExtField.h	2008-03-24 16:27:08 UTC (rev 11520)
@@ -1,5 +1,5 @@
-#ifndef __EXTERNAL_FIELD_H__
-#define __EXTERNAL_FIELD_H__
+#ifndef __EXT_FIELD_H__
+#define __EXT_FIELD_H__
 
 #include <string>
 #include "Points.h"
@@ -8,7 +8,7 @@
 
 namespace cigma
 {
-    class ExternalField;
+    class ExtField;
 }
 
 
@@ -16,7 +16,7 @@
  * @brief External Field object
  *
  */
-class cigma::ExternalField : public Field
+class cigma::ExtField : public Field
 {
 public:
     typedef void (*get_int_fn)(int*);
@@ -24,12 +24,13 @@
     typedef void (*eval_from_points_fn)(int,double*,double*);
 
 public:
-    ExternalField();
-    ~ExternalField();
+    ExtField();
+    ~ExtField();
 
 public:
     int n_dim() { return dim; }
     int n_rank() { return rank; }
+    FieldType getType() { return EXT_FIELD; }
 
 public:
     void load_library(std::string filename, std::string prefix);