[cig-commits] r14413 - cs/cigma/trunk/src

[luis at geodynamics.org]

Author: luis
Date: 2009-03-21 09:57:46 -0700 (Sat, 21 Mar 2009)
New Revision: 14413

Modified:
   cs/cigma/trunk/src/FunctionRegistry.cpp
   cs/cigma/trunk/src/cli_function_info_cmd.cpp
   cs/cigma/trunk/src/fn_gale2.cpp
Log:
Adjust definition of circular inclusion benchmark

Modified: cs/cigma/trunk/src/FunctionRegistry.cpp
===================================================================
--- cs/cigma/trunk/src/FunctionRegistry.cpp	2009-03-21 16:57:45 UTC (rev 14412)
+++ cs/cigma/trunk/src/FunctionRegistry.cpp	2009-03-21 16:57:46 UTC (rev 14413)
@@ -40,7 +40,7 @@
 
     typedef benchmark::circular_inclusion::Pressure PressureFn1;
     shared_ptr<PressureFn1> pressure1(new PressureFn1());
-    this->addFunction("bm.gale.circular_inclusion.pressure", pressure1);
+    this->addFunction("bm.circular_inclusion.pressure", pressure1);
 }
 
 // Destructor

Modified: cs/cigma/trunk/src/cli_function_info_cmd.cpp
===================================================================
--- cs/cigma/trunk/src/cli_function_info_cmd.cpp	2009-03-21 16:57:45 UTC (rev 14412)
+++ cs/cigma/trunk/src/cli_function_info_cmd.cpp	2009-03-21 16:57:46 UTC (rev 14413)
@@ -71,7 +71,7 @@
         || (fn_name == "test.cube")
         || (fn_name == "test.square")
         || (fn_name == "bm.ssnog.displacement")
-        || (fn_name == "bm.gale.circular_inclusion.pressure")
+        || (fn_name == "bm.circular_inclusion.pressure")
         ;
 }
 static void print_registered_function_info(const string& fn_name)
@@ -107,7 +107,7 @@
         cout << "Function Info:" << endl;
         cout << indent << "Name = " << fn_name << endl;
     }
-    else if (fn_name == "bm.gale.circular_inclusion.pressure")
+    else if (fn_name == "bm.circular_inclusion.pressure")
     {
         cout << "Function Info:" << endl;
         cout << indent << "Name = " << fn_name << endl;

Modified: cs/cigma/trunk/src/fn_gale2.cpp
===================================================================
--- cs/cigma/trunk/src/fn_gale2.cpp	2009-03-21 16:57:45 UTC (rev 14412)
+++ cs/cigma/trunk/src/fn_gale2.cpp	2009-03-21 16:57:46 UTC (rev 14413)
@@ -17,17 +17,22 @@
 
 bool Pressure::eval(double *x, double *value)
 {
-    const double R = 0.05;
-    const double C = (8*9/11.0)*R*R;
-    const double xc = 0.5;
-    const double yc = 0.5;
+    const double R = 0.1;
+    const double xc = 0.0;
+    const double yc = 0.0;
+
+    const double mu_m = 1;
+    const double mu_i = 2;
+    const double shear_mag = 1.0;
+    const double C = 4 * shear_mag * (mu_m * (mu_i - mu_m) / (mu_i + mu_m)) * R * R;
+
     const double dx = x[0] - xc;
     const double dy = x[1] - yc;
     const double r2 = dx*dx + dy*dy;
 
     if (r2 < R*R)
     {
-        value[0] = 4.0;
+        value[0] = 0.0;
     }
     else
     {