[cig-commits] [commit] master: continue extracting the inclusion benchmark (a0c8685)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/aspect

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/c883fc069e0dcc93cce45e1d52c84c05c9c4385b...1f4ab820b0191d9a4058b78c91b629bc94c437ec

>---------------------------------------------------------------

commit a0c868578718da8d54e1f8d4091dbbc58e024218
Author: Timo Heister <timo.heister at gmail.com>
Date:   Tue May 20 14:44:11 2014 -0400

    continue extracting the inclusion benchmark


>---------------------------------------------------------------

a0c868578718da8d54e1f8d4091dbbc58e024218
 benchmark/inclusion/inclusion.cc | 6 +++---
 benchmark/inclusion/test.prm     | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/benchmark/inclusion/inclusion.cc b/benchmark/inclusion/inclusion.cc
index 80c3dbd..2329a2f 100644
--- a/benchmark/inclusion/inclusion.cc
+++ b/benchmark/inclusion/inclusion.cc
@@ -618,19 +618,19 @@ namespace aspect
   namespace InclusionBenchmark
   {
     ASPECT_REGISTER_MATERIAL_MODEL(InclusionMaterial,
-                                   "Inclusion",
+                                   "InclusionMaterial",
                                    "A material model that corresponds to the 'Inclusion' benchmark "
                                    "defined in Duretz et al., G-Cubed, 2011.")
 
     ASPECT_REGISTER_VELOCITY_BOUNDARY_CONDITIONS(InclusionBoundary,
-                                                 "inclusion",
+                                                 "InclusionBoundary",
                                                  "Implementation of the velocity boundary conditions for the "
                                                  "``inclusion'' benchmark. See the manual and the Kronbichler, Heister "
                                                  "and Bangerth paper on ASPECT for more information about this "
                                                  "benchmark.")
 
     ASPECT_REGISTER_POSTPROCESSOR(InclusionPostprocessor,
-                                  "DuretzEtAl error",
+                                  "InclusionPostprocessor",
                                   "A postprocessor that compares the solution of the benchmarks from "
                                   "the Duretz et al., G-Cubed, 2011, paper with the one computed by ASPECT "
                                   "and reports the error. Specifically, it can compute the errors for "
diff --git a/benchmark/inclusion/test.prm b/benchmark/inclusion/test.prm
index 927ff4b..2553804 100644
--- a/benchmark/inclusion/test.prm
+++ b/benchmark/inclusion/test.prm
@@ -26,14 +26,14 @@ end
 
 
 subsection Model settings
-  set Prescribed velocity boundary indicators = 0:inclusion, 1:inclusion, 2:inclusion, 3:inclusion
+  set Prescribed velocity boundary indicators = 0:InclusionBoundary, 1:InclusionBoundary, 2:InclusionBoundary, 3:InclusionBoundary
   set Tangential velocity boundary indicators =
   set Zero velocity boundary indicators       =
 end
 
 
 subsection Material model
-  set Model name = local_Inclusion
+  set Model name = InclusionMaterial
 
   subsection Inclusion
     set Viscosity jump = 1e3
@@ -83,7 +83,7 @@ end
 ############### Parameters describing the what to do with the solution
 
 subsection Postprocess
-  set List of postprocessors = DuretzEtAl error, visualization
+  set List of postprocessors = InclusionPostprocessor, visualization