[cig-commits] [commit] master: fix solcx tests (2e73cc3)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Thu May 22 09:52:11 PDT 2014
Repository : https://github.com/geodynamics/aspect
On branch : master
Link : https://github.com/geodynamics/aspect/compare/9e2ada16bd6f0bd33a51d8085b87e3df5192d3e2...b28a5faed4b83ec166a54c58154d1e1137a43bd5
>---------------------------------------------------------------
commit 2e73cc352f5a4a047ec5789ae669723c80dc75e9
Author: Timo Heister <timo.heister at gmail.com>
Date: Wed May 21 17:01:17 2014 -0400
fix solcx tests
>---------------------------------------------------------------
2e73cc352f5a4a047ec5789ae669723c80dc75e9
tests/conservative_with_mpi.cc | 2 ++
tests/conservative_with_mpi.prm | 2 +-
tests/conservative_with_mpi/screen-output | 9 ++++++++-
tests/graphical_output.cc | 2 ++
tests/graphical_output.prm | 4 ++--
tests/graphical_output/screen-output | 9 ++++++++-
tests/non_conservative_with_mpi.cc | 2 ++
tests/non_conservative_with_mpi.prm | 2 +-
tests/non_conservative_with_mpi/screen-output | 9 ++++++++-
tests/plugin.prm | 2 +-
tests/plugin/screen-output | 2 +-
tests/prmbackslash-2.cc | 2 ++
tests/prmbackslash-2.prm | 5 ++---
tests/prmbackslash-2/screen-output | 9 ++++++++-
tests/refinement_topography.cc | 2 ++
tests/refinement_topography.prm | 2 +-
tests/refinement_topography/screen-output | 9 ++++++++-
tests/sol_cx_2.cc | 2 ++
tests/sol_cx_2.prm | 5 +++--
tests/sol_cx_2/screen-output | 9 ++++++++-
tests/sol_cx_2_conservative.cc | 2 ++
tests/sol_cx_2_conservative.prm | 4 ++--
tests/sol_cx_2_conservative/screen-output | 9 ++++++++-
tests/sol_cx_2_normalized_pressure.cc | 2 ++
tests/sol_cx_2_normalized_pressure.prm | 4 ++--
tests/sol_cx_2_normalized_pressure/screen-output | 9 ++++++++-
tests/sol_cx_2_q3.cc | 2 ++
tests/sol_cx_2_q3.prm | 4 ++--
tests/sol_cx_2_q3/screen-output | 9 ++++++++-
tests/sol_cx_4.cc | 2 ++
tests/sol_cx_4.prm | 4 ++--
tests/sol_cx_4/screen-output | 9 ++++++++-
tests/sol_cx_4_conservative.cc | 2 ++
tests/sol_cx_4_conservative.prm | 4 ++--
tests/sol_cx_4_conservative/screen-output | 9 ++++++++-
tests/sol_cx_4_normalized_pressure.cc | 2 ++
tests/sol_cx_4_normalized_pressure.prm | 4 ++--
tests/sol_cx_4_normalized_pressure/screen-output | 9 ++++++++-
tests/sol_cx_4_normalized_pressure_large_static_pressure.cc | 2 ++
tests/sol_cx_4_normalized_pressure_large_static_pressure.prm | 8 ++------
.../screen-output | 9 ++++++++-
tests/sol_cx_4_normalized_pressure_low_solver_tolerance.cc | 2 ++
tests/sol_cx_4_normalized_pressure_low_solver_tolerance.prm | 4 ++--
.../screen-output | 2 ++
tests/sol_cx_tracers.cc | 2 ++
tests/sol_cx_tracers.prm | 2 +-
tests/sol_cx_tracers/screen-output | 2 ++
{benchmark/solcx => tests}/solcx.cc | 0
48 files changed, 167 insertions(+), 46 deletions(-)
diff --git a/tests/conservative_with_mpi.cc b/tests/conservative_with_mpi.cc
new file mode 100644
index 0000000..47d8a84
--- /dev/null
+++ b/tests/conservative_with_mpi.cc
@@ -0,0 +1,2 @@
+#include "solcx.cc"
+
diff --git a/tests/conservative_with_mpi.prm b/tests/conservative_with_mpi.prm
index 3f128f0..a3aefac 100644
--- a/tests/conservative_with_mpi.prm
+++ b/tests/conservative_with_mpi.prm
@@ -77,7 +77,7 @@ end
subsection Material model
- set Model name = SolCx
+ set Model name = SolCxMaterial
end
diff --git a/tests/conservative_with_mpi/screen-output b/tests/conservative_with_mpi/screen-output
index fa7f13e..409dc24 100644
--- a/tests/conservative_with_mpi/screen-output
+++ b/tests/conservative_with_mpi/screen-output
@@ -1,4 +1,11 @@
--- Running with 2 MPI tasks using Trilinos.
+-----------------------------------------------------------------------------
+-- This is ASPECT, the Advanced Solver for Problems in Earth's ConvecTion.
+-- . running in DEBUG mode
+-- . running with 2 MPI processes
+-- . using Trilinos
+-----------------------------------------------------------------------------
+
+Loading shared library <./libconservative_with_mpi.so>
Number of active cells: 16 (on 3 levels)
Number of degrees of freedom: 291 (162+48+81)
diff --git a/tests/graphical_output.cc b/tests/graphical_output.cc
new file mode 100644
index 0000000..47d8a84
--- /dev/null
+++ b/tests/graphical_output.cc
@@ -0,0 +1,2 @@
+#include "solcx.cc"
+
diff --git a/tests/graphical_output.prm b/tests/graphical_output.prm
index a5ad320..4ef539a 100644
--- a/tests/graphical_output.prm
+++ b/tests/graphical_output.prm
@@ -72,7 +72,7 @@ end
subsection Material model
- set Model name = SolCx
+ set Model name = SolCxMaterial
end
@@ -100,7 +100,7 @@ end
subsection Postprocess
- set List of postprocessors = DuretzEtAl error, visualization
+ set List of postprocessors = SolCxPostprocessor, visualization
subsection Depth average
set Time between graphical output = 0
diff --git a/tests/graphical_output/screen-output b/tests/graphical_output/screen-output
index d3e880b..d206ffe 100644
--- a/tests/graphical_output/screen-output
+++ b/tests/graphical_output/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 <./libgraphical_output.so>
Number of active cells: 16 (on 3 levels)
Number of degrees of freedom: 268 (162+25+81)
diff --git a/tests/non_conservative_with_mpi.cc b/tests/non_conservative_with_mpi.cc
new file mode 100644
index 0000000..47d8a84
--- /dev/null
+++ b/tests/non_conservative_with_mpi.cc
@@ -0,0 +1,2 @@
+#include "solcx.cc"
+
diff --git a/tests/non_conservative_with_mpi.prm b/tests/non_conservative_with_mpi.prm
index 663b961..2aa9b54 100644
--- a/tests/non_conservative_with_mpi.prm
+++ b/tests/non_conservative_with_mpi.prm
@@ -74,7 +74,7 @@ end
subsection Material model
- set Model name = SolCx
+ set Model name = SolCxMaterial
end
diff --git a/tests/non_conservative_with_mpi/screen-output b/tests/non_conservative_with_mpi/screen-output
index 76053b3..6c09319 100644
--- a/tests/non_conservative_with_mpi/screen-output
+++ b/tests/non_conservative_with_mpi/screen-output
@@ -1,4 +1,11 @@
--- Running with 2 MPI tasks using Trilinos.
+-----------------------------------------------------------------------------
+-- This is ASPECT, the Advanced Solver for Problems in Earth's ConvecTion.
+-- . running in DEBUG mode
+-- . running with 2 MPI processes
+-- . using Trilinos
+-----------------------------------------------------------------------------
+
+Loading shared library <./libnon_conservative_with_mpi.so>
Number of active cells: 16 (on 3 levels)
Number of degrees of freedom: 268 (162+25+81)
diff --git a/tests/plugin.prm b/tests/plugin.prm
index 4d64ea1..bee4cc3 100644
--- a/tests/plugin.prm
+++ b/tests/plugin.prm
@@ -70,7 +70,7 @@ end
subsection Material model
- set Model name = SolCx
+ set Model name = simple
end
diff --git a/tests/plugin/screen-output b/tests/plugin/screen-output
index ebd5cee..d1decf1 100644
--- a/tests/plugin/screen-output
+++ b/tests/plugin/screen-output
@@ -8,7 +8,7 @@ Number of degrees of freedom: 268 (162+25+81)
*** Timestep 0: t=0 seconds
Solving temperature system... 0 iterations.
Rebuilding Stokes preconditioner...
- Solving Stokes system... 17 iterations.
+ Solving Stokes system... 6 iterations.
Postprocessing:
diff --git a/tests/prmbackslash-2.cc b/tests/prmbackslash-2.cc
new file mode 100644
index 0000000..47d8a84
--- /dev/null
+++ b/tests/prmbackslash-2.cc
@@ -0,0 +1,2 @@
+#include "solcx.cc"
+
diff --git a/tests/prmbackslash-2.prm b/tests/prmbackslash-2.prm
index 7e99410..a4f16ab 100644
--- a/tests/prmbackslash-2.prm
+++ b/tests/prmbackslash-2.prm
@@ -99,7 +99,7 @@ end
subsection Material \
model
set Model name = S\
-olCx
+olCxMaterial
end
@@ -145,8 +145,7 @@ end
subsection Postproce\
ss
set List of postpr\
-ocessors = DuretzEtAl err\
-or
+ocessors = SolCxPostprocessor
subsection Depth a\
verage
set Time between\
diff --git a/tests/prmbackslash-2/screen-output b/tests/prmbackslash-2/screen-output
index fb7c9e2..93bb81a 100644
--- a/tests/prmbackslash-2/screen-output
+++ b/tests/prmbackslash-2/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 <./libprmbackslash-2.so>
Number of active cells: 16 (on 3 levels)
Number of degrees of freedom: 268 (162+25+81)
diff --git a/tests/refinement_topography.cc b/tests/refinement_topography.cc
new file mode 100644
index 0000000..47d8a84
--- /dev/null
+++ b/tests/refinement_topography.cc
@@ -0,0 +1,2 @@
+#include "solcx.cc"
+
diff --git a/tests/refinement_topography.prm b/tests/refinement_topography.prm
index 9a34f78..861eb96 100644
--- a/tests/refinement_topography.prm
+++ b/tests/refinement_topography.prm
@@ -74,7 +74,7 @@ end
subsection Material model
- set Model name = SolCx
+ set Model name = SolCxMaterial
end
diff --git a/tests/refinement_topography/screen-output b/tests/refinement_topography/screen-output
index b7796f1..d034747 100644
--- a/tests/refinement_topography/screen-output
+++ b/tests/refinement_topography/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 <./librefinement_topography.so>
Number of active cells: 16 (on 3 levels)
Number of degrees of freedom: 268 (162+25+81)
diff --git a/tests/sol_cx_2.cc b/tests/sol_cx_2.cc
new file mode 100644
index 0000000..47d8a84
--- /dev/null
+++ b/tests/sol_cx_2.cc
@@ -0,0 +1,2 @@
+#include "solcx.cc"
+
diff --git a/tests/sol_cx_2.prm b/tests/sol_cx_2.prm
index 44c63f2..25175aa 100644
--- a/tests/sol_cx_2.prm
+++ b/tests/sol_cx_2.prm
@@ -1,4 +1,5 @@
+set Additional shared libraries = ./libsolcx.so
set Dimension = 2
@@ -71,7 +72,7 @@ end
subsection Material model
- set Model name = SolCx
+ set Model name = SolCxMaterial
end
@@ -99,7 +100,7 @@ end
subsection Postprocess
- set List of postprocessors = DuretzEtAl error
+ set List of postprocessors = SolCxPostprocessor
subsection Depth average
set Time between graphical output = 1e8
diff --git a/tests/sol_cx_2/screen-output b/tests/sol_cx_2/screen-output
index fb7c9e2..dc49413 100644
--- a/tests/sol_cx_2/screen-output
+++ b/tests/sol_cx_2/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 <./libsol_cx_2.so>
Number of active cells: 16 (on 3 levels)
Number of degrees of freedom: 268 (162+25+81)
diff --git a/tests/sol_cx_2_conservative.cc b/tests/sol_cx_2_conservative.cc
new file mode 100644
index 0000000..47d8a84
--- /dev/null
+++ b/tests/sol_cx_2_conservative.cc
@@ -0,0 +1,2 @@
+#include "solcx.cc"
+
diff --git a/tests/sol_cx_2_conservative.prm b/tests/sol_cx_2_conservative.prm
index 7ae09fd..e4a7cf5 100644
--- a/tests/sol_cx_2_conservative.prm
+++ b/tests/sol_cx_2_conservative.prm
@@ -72,7 +72,7 @@ end
subsection Material model
- set Model name = SolCx
+ set Model name = SolCxMaterial
end
@@ -100,7 +100,7 @@ end
subsection Postprocess
- set List of postprocessors = DuretzEtAl error
+ set List of postprocessors = SolCxPostprocessor
subsection Depth average
set Time between graphical output = 1e8
diff --git a/tests/sol_cx_2_conservative/screen-output b/tests/sol_cx_2_conservative/screen-output
index fae6201..1245f01 100644
--- a/tests/sol_cx_2_conservative/screen-output
+++ b/tests/sol_cx_2_conservative/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 <./libsol_cx_2_conservative.so>
Number of active cells: 16 (on 3 levels)
Number of degrees of freedom: 291 (162+48+81)
diff --git a/tests/sol_cx_2_normalized_pressure.cc b/tests/sol_cx_2_normalized_pressure.cc
new file mode 100644
index 0000000..47d8a84
--- /dev/null
+++ b/tests/sol_cx_2_normalized_pressure.cc
@@ -0,0 +1,2 @@
+#include "solcx.cc"
+
diff --git a/tests/sol_cx_2_normalized_pressure.prm b/tests/sol_cx_2_normalized_pressure.prm
index 1a9a056..84c1b13 100644
--- a/tests/sol_cx_2_normalized_pressure.prm
+++ b/tests/sol_cx_2_normalized_pressure.prm
@@ -73,7 +73,7 @@ end
subsection Material model
- set Model name = SolCx
+ set Model name = SolCxMaterial
end
@@ -101,7 +101,7 @@ end
subsection Postprocess
- set List of postprocessors = DuretzEtAl error
+ set List of postprocessors = SolCxPostprocessor
subsection Depth average
set Time between graphical output = 1e8
diff --git a/tests/sol_cx_2_normalized_pressure/screen-output b/tests/sol_cx_2_normalized_pressure/screen-output
index 643baf2..fdf82a3 100644
--- a/tests/sol_cx_2_normalized_pressure/screen-output
+++ b/tests/sol_cx_2_normalized_pressure/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 <./libsol_cx_2_normalized_pressure.so>
Number of active cells: 16 (on 3 levels)
Number of degrees of freedom: 268 (162+25+81)
diff --git a/tests/sol_cx_2_q3.cc b/tests/sol_cx_2_q3.cc
new file mode 100644
index 0000000..47d8a84
--- /dev/null
+++ b/tests/sol_cx_2_q3.cc
@@ -0,0 +1,2 @@
+#include "solcx.cc"
+
diff --git a/tests/sol_cx_2_q3.prm b/tests/sol_cx_2_q3.prm
index 8f06def..0264e54 100644
--- a/tests/sol_cx_2_q3.prm
+++ b/tests/sol_cx_2_q3.prm
@@ -72,7 +72,7 @@ end
subsection Material model
- set Model name = SolCx
+ set Model name = SolCxMaterial
end
@@ -100,7 +100,7 @@ end
subsection Postprocess
- set List of postprocessors = DuretzEtAl error
+ set List of postprocessors = SolCxPostprocessor
subsection Depth average
set Time between graphical output = 1e8
diff --git a/tests/sol_cx_2_q3/screen-output b/tests/sol_cx_2_q3/screen-output
index 6cdd27c..989ec82 100644
--- a/tests/sol_cx_2_q3/screen-output
+++ b/tests/sol_cx_2_q3/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 <./libsol_cx_2_q3.so>
Number of active cells: 16 (on 3 levels)
Number of degrees of freedom: 500 (338+81+81)
diff --git a/tests/sol_cx_4.cc b/tests/sol_cx_4.cc
new file mode 100644
index 0000000..47d8a84
--- /dev/null
+++ b/tests/sol_cx_4.cc
@@ -0,0 +1,2 @@
+#include "solcx.cc"
+
diff --git a/tests/sol_cx_4.prm b/tests/sol_cx_4.prm
index 1fca60f..1bbbe2e 100644
--- a/tests/sol_cx_4.prm
+++ b/tests/sol_cx_4.prm
@@ -72,7 +72,7 @@ end
subsection Material model
- set Model name = SolCx
+ set Model name = SolCxMaterial
end
@@ -100,7 +100,7 @@ end
subsection Postprocess
- set List of postprocessors = DuretzEtAl error
+ set List of postprocessors = SolCxPostprocessor
subsection Depth average
set Time between graphical output = 1e8
diff --git a/tests/sol_cx_4/screen-output b/tests/sol_cx_4/screen-output
index b59cf3c..9c68cc6 100644
--- a/tests/sol_cx_4/screen-output
+++ b/tests/sol_cx_4/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 <./libsol_cx_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/sol_cx_4_conservative.cc b/tests/sol_cx_4_conservative.cc
new file mode 100644
index 0000000..47d8a84
--- /dev/null
+++ b/tests/sol_cx_4_conservative.cc
@@ -0,0 +1,2 @@
+#include "solcx.cc"
+
diff --git a/tests/sol_cx_4_conservative.prm b/tests/sol_cx_4_conservative.prm
index e154f72..2b1f9b5 100644
--- a/tests/sol_cx_4_conservative.prm
+++ b/tests/sol_cx_4_conservative.prm
@@ -72,7 +72,7 @@ end
subsection Material model
- set Model name = SolCx
+ set Model name = SolCxMaterial
end
@@ -100,7 +100,7 @@ end
subsection Postprocess
- set List of postprocessors = DuretzEtAl error
+ set List of postprocessors = SolCxPostprocessor
subsection Depth average
set Time between graphical output = 1e8
diff --git a/tests/sol_cx_4_conservative/screen-output b/tests/sol_cx_4_conservative/screen-output
index 6b8fd53..c4fd571 100644
--- a/tests/sol_cx_4_conservative/screen-output
+++ b/tests/sol_cx_4_conservative/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 <./libsol_cx_4_conservative.so>
Number of active cells: 256 (on 5 levels)
Number of degrees of freedom: 4,035 (2,178+768+1,089)
diff --git a/tests/sol_cx_4_normalized_pressure.cc b/tests/sol_cx_4_normalized_pressure.cc
new file mode 100644
index 0000000..47d8a84
--- /dev/null
+++ b/tests/sol_cx_4_normalized_pressure.cc
@@ -0,0 +1,2 @@
+#include "solcx.cc"
+
diff --git a/tests/sol_cx_4_normalized_pressure.prm b/tests/sol_cx_4_normalized_pressure.prm
index 1ea5bf1..5c504b8 100644
--- a/tests/sol_cx_4_normalized_pressure.prm
+++ b/tests/sol_cx_4_normalized_pressure.prm
@@ -73,7 +73,7 @@ end
subsection Material model
- set Model name = SolCx
+ set Model name = SolCxMaterial
end
@@ -101,7 +101,7 @@ end
subsection Postprocess
- set List of postprocessors = DuretzEtAl error
+ set List of postprocessors = SolCxPostprocessor
subsection Depth average
set Time between graphical output = 1e8
diff --git a/tests/sol_cx_4_normalized_pressure/screen-output b/tests/sol_cx_4_normalized_pressure/screen-output
index 7992b90..1054dfb 100644
--- a/tests/sol_cx_4_normalized_pressure/screen-output
+++ b/tests/sol_cx_4_normalized_pressure/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 <./libsol_cx_4_normalized_pressure.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/sol_cx_4_normalized_pressure_large_static_pressure.cc b/tests/sol_cx_4_normalized_pressure_large_static_pressure.cc
new file mode 100644
index 0000000..47d8a84
--- /dev/null
+++ b/tests/sol_cx_4_normalized_pressure_large_static_pressure.cc
@@ -0,0 +1,2 @@
+#include "solcx.cc"
+
diff --git a/tests/sol_cx_4_normalized_pressure_large_static_pressure.prm b/tests/sol_cx_4_normalized_pressure_large_static_pressure.prm
index 6fa159d..4367a8e 100644
--- a/tests/sol_cx_4_normalized_pressure_large_static_pressure.prm
+++ b/tests/sol_cx_4_normalized_pressure_large_static_pressure.prm
@@ -11,7 +11,7 @@
subsection Material model
- set Model name = SolCx
+ set Model name = SolCxMaterial
subsection SolCx
set Background density = 1e6
@@ -91,10 +91,6 @@ subsection Initial conditions
end
-subsection Material model
- set Model name = SolCx
-end
-
subsection Mesh refinement
set Initial adaptive refinement = 0 # default: 2
@@ -120,7 +116,7 @@ end
subsection Postprocess
- set List of postprocessors = DuretzEtAl error
+ set List of postprocessors = SolCxPostprocessor
subsection Depth average
set Time between graphical output = 1e8
diff --git a/tests/sol_cx_4_normalized_pressure_large_static_pressure/screen-output b/tests/sol_cx_4_normalized_pressure_large_static_pressure/screen-output
index 3de398f..46655e3 100644
--- a/tests/sol_cx_4_normalized_pressure_large_static_pressure/screen-output
+++ b/tests/sol_cx_4_normalized_pressure_large_static_pressure/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 <./libsol_cx_4_normalized_pressure_large_static_pressure.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/sol_cx_4_normalized_pressure_low_solver_tolerance.cc b/tests/sol_cx_4_normalized_pressure_low_solver_tolerance.cc
new file mode 100644
index 0000000..47d8a84
--- /dev/null
+++ b/tests/sol_cx_4_normalized_pressure_low_solver_tolerance.cc
@@ -0,0 +1,2 @@
+#include "solcx.cc"
+
diff --git a/tests/sol_cx_4_normalized_pressure_low_solver_tolerance.prm b/tests/sol_cx_4_normalized_pressure_low_solver_tolerance.prm
index ba3e67a..8d9ed05 100644
--- a/tests/sol_cx_4_normalized_pressure_low_solver_tolerance.prm
+++ b/tests/sol_cx_4_normalized_pressure_low_solver_tolerance.prm
@@ -79,7 +79,7 @@ end
subsection Material model
- set Model name = SolCx
+ set Model name = SolCxMaterial
end
@@ -107,7 +107,7 @@ end
subsection Postprocess
- set List of postprocessors = DuretzEtAl error
+ set List of postprocessors = SolCxPostprocessor
subsection Depth average
set Time between graphical output = 1e8
diff --git a/tests/sol_cx_4_normalized_pressure_low_solver_tolerance/screen-output b/tests/sol_cx_4_normalized_pressure_low_solver_tolerance/screen-output
index 00a597b..4128618 100644
--- a/tests/sol_cx_4_normalized_pressure_low_solver_tolerance/screen-output
+++ b/tests/sol_cx_4_normalized_pressure_low_solver_tolerance/screen-output
@@ -1,5 +1,7 @@
-- Running with 1 MPI task using Trilinos.
+Loading shared library <./libsol_cx_4_normalized_pressure_low_solver_tolerance.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/sol_cx_tracers.cc b/tests/sol_cx_tracers.cc
new file mode 100644
index 0000000..47d8a84
--- /dev/null
+++ b/tests/sol_cx_tracers.cc
@@ -0,0 +1,2 @@
+#include "solcx.cc"
+
diff --git a/tests/sol_cx_tracers.prm b/tests/sol_cx_tracers.prm
index 037fc23..7b960cc 100644
--- a/tests/sol_cx_tracers.prm
+++ b/tests/sol_cx_tracers.prm
@@ -72,7 +72,7 @@ end
subsection Material model
- set Model name = SolCx
+ set Model name = SolCxMaterial
end
diff --git a/tests/sol_cx_tracers/screen-output b/tests/sol_cx_tracers/screen-output
index 1e81b36..73f74a2 100644
--- a/tests/sol_cx_tracers/screen-output
+++ b/tests/sol_cx_tracers/screen-output
@@ -1,5 +1,7 @@
-- Running with 1 MPI task using Trilinos.
+Loading shared library <./libsol_cx_tracers.so>
+
Number of active cells: 256 (on 5 levels)
Number of degrees of freedom: 3,556 (2,178+289+1,089)
diff --git a/benchmark/solcx/solcx.cc b/tests/solcx.cc
similarity index 100%
copy from benchmark/solcx/solcx.cc
copy to tests/solcx.cc
More information about the CIG-COMMITS
mailing list