[cig-commits] [commit] master: add test (347903e)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/75a1eead49c5165ff3ecee1573c3f4577ef534bb...62599834f9944b32d7d25d117a9a394c565642ea

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

commit 347903efffd2a974ed201a136ab4f14ed219639d
Author: Timo Heister <timo.heister at gmail.com>
Date:   Wed Jun 11 11:16:18 2014 -0400

    add test


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

347903efffd2a974ed201a136ab4f14ed219639d
 ...ompressibility_iterated_stokes_direct_solver.cc |  1 +
 ...pressibility_iterated_stokes_direct_solver.prm} | 17 ++++-----
 .../screen-output                                  | 43 ++++++++++++++++++++++
 3 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/tests/compressibility_iterated_stokes_direct_solver.cc b/tests/compressibility_iterated_stokes_direct_solver.cc
new file mode 100644
index 0000000..fd40b9a
--- /dev/null
+++ b/tests/compressibility_iterated_stokes_direct_solver.cc
@@ -0,0 +1 @@
+#include "compressibility_iterated_stokes.cc"
diff --git a/tests/simple_compressibility_iterated_stokes.prm b/tests/compressibility_iterated_stokes_direct_solver.prm
similarity index 81%
copy from tests/simple_compressibility_iterated_stokes.prm
copy to tests/compressibility_iterated_stokes_direct_solver.prm
index 27ebfae..657808b 100644
--- a/tests/simple_compressibility_iterated_stokes.prm
+++ b/tests/compressibility_iterated_stokes_direct_solver.prm
@@ -1,7 +1,5 @@
-# A variation on the 'compressibility_iterated_stokes' testcase. 
-# The only variation is the used material model. This test adapts the
-# 'simple compressible' material model plugin to do the same job as the 
-# shared library material model from compressibility_iterated_stokes.cc
+# Copy of compressibility_iterated_stokes but using a direct solver. This is
+# to check that solve_stokes() returns the correct nonlinear residual.
 
 set Dimension = 2
 set CFL number                             = 1.0
@@ -14,7 +12,7 @@ set Use years in output instead of seconds = false  # default: true
 set Nonlinear solver scheme                = Stokes only
 set Max nonlinear iterations               = 5
 
-
+set Use direct solver for Stokes system = true
 
 subsection Boundary temperature model
   set Model name = box
@@ -57,13 +55,14 @@ end
 
 
 subsection Material model
-  set Model name = simple compressible
+  set Model name = compressibility iterated stokes
 
-  subsection Simple compressible model
-    set Reference density             = 0.909090909090    # default: 3300
-    set Reference compressibility     = 0.01
+  subsection Simple model
+    set Reference density             = 1    # default: 3300
     set Reference specific heat       = 1250
+    set Reference temperature         = 0    # default: 293
     set Thermal conductivity          = 1e-6 # default: 4.7
+    set Thermal expansion coefficient = 0
     set Viscosity                     = 1    # default: 5e24
   end
 end
diff --git a/tests/compressibility_iterated_stokes_direct_solver/screen-output b/tests/compressibility_iterated_stokes_direct_solver/screen-output
new file mode 100644
index 0000000..097e424
--- /dev/null
+++ b/tests/compressibility_iterated_stokes_direct_solver/screen-output
@@ -0,0 +1,43 @@
+-----------------------------------------------------------------------------
+-- This is ASPECT, the Advanced Solver for Problems in Earth's ConvecTion.
+--     . version 1.2.pre
+--     . running in DEBUG mode
+--     . running with 1 MPI process
+--     . using Trilinos
+-----------------------------------------------------------------------------
+
+Loading shared library <./libcompressibility_iterated_stokes_direct_solver.so>
+
+Number of active cells: 1,024 (on 6 levels)
+Number of degrees of freedom: 13,764 (9,539+4,225)
+
+*** Timestep 0:  t=0 seconds
+   Solving Stokes system... done.
+      Nonlinear Stokes residual: 21.2064
+   Solving Stokes system... done.
+      Nonlinear Stokes residual: 0.293292
+   Solving Stokes system... done.
+      Nonlinear Stokes residual: 0.0159069
+   Solving Stokes system... done.
+      Nonlinear Stokes residual: 0.000575267
+   Solving Stokes system... done.
+      Nonlinear Stokes residual: 1.42992e-05
+
+   Postprocessing:
+     Top/bottom flux: 1/1
+
+Termination requested by criterion: end time
+
+
++---------------------------------------------+------------+------------+
+| Total wallclock time elapsed since start    |      1.68s |            |
+|                                             |            |            |
+| Section                         | no. calls |  wall time | % of total |
++---------------------------------+-----------+------------+------------+
+| Assemble Stokes system          |         5 |     0.793s |        47% |
+| Solve Stokes system             |         5 |       0.7s |        42% |
+| Initialization                  |         2 |     0.045s |       2.7% |
+| Postprocessing                  |         1 |   0.00193s |      0.11% |
+| Setup dof systems               |         1 |    0.0792s |       4.7% |
++---------------------------------+-----------+------------+------------+
+