[cig-commits] [commit] master: fix all inclusion tests (1763967)

[cig_noreply at geodynamics.org]

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

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

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

commit 17639672ea121a4727ad45c42e42c33322f07cc9
Author: Timo Heister <timo.heister at gmail.com>
Date:   Tue May 20 16:22:05 2014 -0400

    fix all inclusion tests


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

17639672ea121a4727ad45c42e42c33322f07cc9
 tests/inclusion_4.cc                   | 2 ++
 tests/inclusion_4.prm                  | 6 +++---
 tests/inclusion_4/screen-output        | 2 ++
 tests/inclusion_adaptive.cc            | 2 ++
 tests/inclusion_adaptive.prm           | 6 +++---
 tests/inclusion_adaptive/screen-output | 9 ++++++++-
 6 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/tests/inclusion_4.cc b/tests/inclusion_4.cc
new file mode 100644
index 0000000..eeae48b
--- /dev/null
+++ b/tests/inclusion_4.cc
@@ -0,0 +1,2 @@
+#include "inclusion_2.cc"
+
diff --git a/tests/inclusion_4.prm b/tests/inclusion_4.prm
index f2f71a5..2add4e8 100644
--- a/tests/inclusion_4.prm
+++ b/tests/inclusion_4.prm
@@ -72,7 +72,7 @@ end
 
 
 subsection Material model
-  set Model name = Inclusion
+  set Model name = InclusionMaterial
 end
 
 
@@ -91,7 +91,7 @@ subsection Model settings
 
   set Fixed temperature boundary indicators   = 0, 1
 
-  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 =
 
@@ -100,7 +100,7 @@ end
 
 
 subsection Postprocess
-  set List of postprocessors = visualization, DuretzEtAl error
+  set List of postprocessors = visualization, InclusionPostprocessor
 
   subsection Depth average
     set Time between graphical output = 1e8
diff --git a/tests/inclusion_4/screen-output b/tests/inclusion_4/screen-output
index c494e05..40b34b1 100644
--- a/tests/inclusion_4/screen-output
+++ b/tests/inclusion_4/screen-output
@@ -1,5 +1,7 @@
 -- Running with 1 MPI task using Trilinos.
 
+Loading shared library <./libinclusion_4.so>
+
 Number of active cells: 256 (on 5 levels)
 Number of degrees of freedom: 3,556 (2,178+289+1,089)
 
diff --git a/tests/inclusion_adaptive.cc b/tests/inclusion_adaptive.cc
new file mode 100644
index 0000000..eeae48b
--- /dev/null
+++ b/tests/inclusion_adaptive.cc
@@ -0,0 +1,2 @@
+#include "inclusion_2.cc"
+
diff --git a/tests/inclusion_adaptive.prm b/tests/inclusion_adaptive.prm
index 72223a6..8d9bfe1 100644
--- a/tests/inclusion_adaptive.prm
+++ b/tests/inclusion_adaptive.prm
@@ -72,7 +72,7 @@ end
 
 
 subsection Material model
-  set Model name = Inclusion
+  set Model name = InclusionMaterial
 
 subsection Inclusion
 set Viscosity jump = 1e3
@@ -101,7 +101,7 @@ subsection Model settings
 
   set Fixed temperature boundary indicators   = 0, 1
 
-  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 =
 
@@ -110,7 +110,7 @@ end
 
 
 subsection Postprocess
-  set List of postprocessors = visualization, DuretzEtAl error
+  set List of postprocessors = visualization, InclusionPostprocessor
 
   subsection Depth average
     set Time between graphical output = 1e8
diff --git a/tests/inclusion_adaptive/screen-output b/tests/inclusion_adaptive/screen-output
index 55caee1..c73ff53 100644
--- a/tests/inclusion_adaptive/screen-output
+++ b/tests/inclusion_adaptive/screen-output
@@ -1,4 +1,11 @@
--- Running with 1 MPI task using Trilinos.
+-----------------------------------------------------------------------------
+-- This is ASPECT, the Advanced Solver for Problems in Earth's ConvecTion.
+--     . running in DEBUG mode
+--     . running with 1 MPI process
+--     . using Trilinos
+-----------------------------------------------------------------------------
+
+Loading shared library <./libinclusion_adaptive.so>
 
 Number of active cells: 64 (on 4 levels)
 Number of degrees of freedom: 948 (578+81+289)