[cig-commits] r14068 - in cs/cigma/trunk: . src

[luis at geodynamics.org]

Author: luis
Date: 2009-02-18 08:14:09 -0800 (Wed, 18 Feb 2009)
New Revision: 14068

Modified:
   cs/cigma/trunk/Makefile.am
   cs/cigma/trunk/src/FunctionRegistry.cpp
   cs/cigma/trunk/src/fn_gale2.h
Log:
Restore circular_inclusion benchmark

Figure out a better name under which to register this function

Modified: cs/cigma/trunk/Makefile.am
===================================================================
--- cs/cigma/trunk/Makefile.am	2009-02-18 05:44:44 UTC (rev 14067)
+++ cs/cigma/trunk/Makefile.am	2009-02-18 16:14:09 UTC (rev 14068)
@@ -274,7 +274,9 @@
 	src/io_vtk_writer.cpp
 
 # Add disloc3d function to libcigma.a {{{
-#
+# We separate this assignment to demonstrate how to
+# introduce external code dependencies into libcigma.a
+# (which are then included statically in the library)
 libcigma_la_cppflags += -I$(top_srcdir)/src/contrib/elastic-okada
 libcigma_la_sources += \
 	src/contrib/elastic-okada/dc3d.h \
@@ -289,6 +291,11 @@
 #
 # }}}
 
+# Finally, add other registered functions to libcigma.a
+libcigma_la_sources += \
+	src/fn_gale2.h \
+	src/fn_gale2.cpp
+
 # }}}
 
 

Modified: cs/cigma/trunk/src/FunctionRegistry.cpp
===================================================================
--- cs/cigma/trunk/src/FunctionRegistry.cpp	2009-02-18 05:44:44 UTC (rev 14067)
+++ cs/cigma/trunk/src/FunctionRegistry.cpp	2009-02-18 16:14:09 UTC (rev 14068)
@@ -4,6 +4,7 @@
 #include "fn_one.h"
 #include "fn_test.h"
 #include "fn_disloc3d.h"
+#include "fn_gale2.h"
 #include <cassert>
 #include <iostream>
 
@@ -36,6 +37,10 @@
     typedef benchmark::quasistatic::strikeslipnog::OkadaDisloc3d DislocFn1;
     shared_ptr<DislocFn1> disloc1(new DislocFn1());
     this->addFunction("bm.ssnog.displacement", disloc1);
+
+    typedef benchmark::circular_inclusion::Pressure PressureFn1;
+    shared_ptr<PressureFn1> pressure1(new PressureFn1());
+    this->addFunction("bm.gale.circular_inclusion.pressure", pressure1);
 }
 
 // Destructor

Modified: cs/cigma/trunk/src/fn_gale2.h
===================================================================
--- cs/cigma/trunk/src/fn_gale2.h	2009-02-18 05:44:44 UTC (rev 14067)
+++ cs/cigma/trunk/src/fn_gale2.h	2009-02-18 16:14:09 UTC (rev 14068)
@@ -18,8 +18,9 @@
     Pressure();
     ~Pressure();
 
-    virtual int n_dim() { return 2; }
-    virtual int n_rank() { return 1; }
+    virtual int n_dim() const { return 2; }
+    virtual int n_rank() const { return 1; }
+    virtual Function::type getType() const { return GENERAL_FN; }
 
     virtual bool eval(double *x, double *value);