[cig-commits] [commit] master: experimental material model lib for inclusion benchmark (aced19a)

[cig_noreply at geodynamics.org]

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

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

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

commit aced19a3054e13128a0a628a1b175bd905ec450e
Author: Timo Heister <timo.heister at gmail.com>
Date:   Fri May 16 15:29:19 2014 -0400

    experimental material model lib for inclusion benchmark


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

aced19a3054e13128a0a628a1b175bd905ec450e
 benchmark/inclusion/CMakeLists.txt                     | 12 ++++++++++++
 .../inclusion/source.cc                                | 18 +++++++++++++-----
 benchmark/inclusion/{adaptive.prm => test.prm}         |  5 ++++-
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/benchmark/inclusion/CMakeLists.txt b/benchmark/inclusion/CMakeLists.txt
new file mode 100644
index 0000000..0523408
--- /dev/null
+++ b/benchmark/inclusion/CMakeLists.txt
@@ -0,0 +1,12 @@
+cmake_minimum_required(VERSION 2.8)
+
+SET(TARGET "source")
+FIND_PACKAGE(deal.II 8.0 QUIET
+  HINTS ${deal.II_DIR} ${DEAL_II_DIR} ../ ../../ $ENV{DEAL_II_DIR}
+  )
+
+DEAL_II_INITIALIZE_CACHED_VARIABLES()
+INCLUDE_DIRECTORIES(../../include)
+
+ADD_LIBRARY(${TARGET} SHARED  source.cc)
+DEAL_II_SETUP_TARGET(${TARGET})
diff --git a/tests/no_adiabatic_heating.cc b/benchmark/inclusion/source.cc
similarity index 70%
copy from tests/no_adiabatic_heating.cc
copy to benchmark/inclusion/source.cc
index 71373b5..a98939e 100644
--- a/tests/no_adiabatic_heating.cc
+++ b/benchmark/inclusion/source.cc
@@ -1,6 +1,6 @@
-// use the same postprocessing facilities as for the
-// 'compressibility_iterated_stokes' testcase
-#include "compressibility_iterated_stokes.cc"
+#include <aspect/material_model/simple.h>
+#include <aspect/simulator_access.h>
+
 
 namespace aspect
 {
@@ -9,7 +9,7 @@ namespace aspect
     using namespace dealii;
 
     template <int dim>
-    class NoAdiabaticHeating : public CompressibilityIteratedStokes<dim>
+    class NoAdiabaticHeating :  public MaterialModel::Simple<dim>
     {
       public:
         virtual double thermal_expansion_coefficient (const double,
@@ -17,6 +17,8 @@ namespace aspect
                                                       const std::vector<double> &,
                                                       const Point<dim> &) const
 	{
+	  std::cout << "hi" << std::endl;
+	  
 	  return 0;
 	}
     };
@@ -25,13 +27,19 @@ namespace aspect
 }
 
 
+
+
+
+
+
+
 // explicit instantiations
 namespace aspect
 {
   namespace MaterialModel
   {
     ASPECT_REGISTER_MATERIAL_MODEL(NoAdiabaticHeating,
-                                   "no adiabatic heating",
+                                   "local_Inclusion",
                                    "As described in the .prm file.")
   }
 }
diff --git a/benchmark/inclusion/adaptive.prm b/benchmark/inclusion/test.prm
similarity index 94%
copy from benchmark/inclusion/adaptive.prm
copy to benchmark/inclusion/test.prm
index ad95fb2..75d31a8 100644
--- a/benchmark/inclusion/adaptive.prm
+++ b/benchmark/inclusion/test.prm
@@ -1,5 +1,8 @@
 ############### Global parameters
 
+set Additional shared libraries            = benchmark/inclusion/libsource.so
+
+
 set Dimension                              = 2
 
 set Start time                             = 0
@@ -30,7 +33,7 @@ end
 
 
 subsection Material model
-  set Model name = Inclusion
+  set Model name = local_Inclusion
 
   subsection Inclusion
     set Viscosity jump = 1e3