[cig-commits] commit 2562 by heister to /var/svn/dealii/aspect

[dealii.demon at gmail.com]

Revision 2562

merge from mainline

_U  branches/freesurface/
U   branches/freesurface/doc/modules/0.3-to-1.0.h
U   branches/freesurface/source/material_model/steinberger.cc
U   branches/freesurface/tests/run_testsuite.cmake


http://www.dealii.org/websvn/revision.php?repname=Aspect+Repository&path=%2F&rev=2562&peg=2562

Diff:
Index: branches/freesurface
===================================================================
--- branches/freesurface	2014-04-23 16:07:13 UTC (rev 2561)
+++ branches/freesurface	2014-04-29 23:04:43 UTC (rev 2562)

Property changes on: branches/freesurface
___________________________________________________________________
Modified: svn:mergeinfo
## -2,4 +2,4 ##
 /branches/compositional:1141-1251
 /branches/fully-nonlinear:542-728
 /branches/j-dannberg:1679,1875-1882
-/trunk/aspect:2386-2550
+/trunk/aspect:2386-2561
\ No newline at end of property
Modified: branches/freesurface/doc/modules/0.3-to-1.0.h
===================================================================
--- branches/freesurface/doc/modules/0.3-to-1.0.h	2014-04-23 16:07:13 UTC (rev 2561)
+++ branches/freesurface/doc/modules/0.3-to-1.0.h	2014-04-29 23:04:43 UTC (rev 2562)
@@ -1,6 +1,5 @@
 /**
- * @page changes_between_0.3_and_1.0 Changes between version 0.3 and version
- * 1.0
+ * @page changes_between_0.3_and_1.0 Changes between version 0.3 and version 1.0
  *
  * <p> This is the list of changes made after the release of Aspect version
  * 0.3 and before 1.0. All entries are signed with the names of the author.

Modified: branches/freesurface/source/material_model/steinberger.cc
===================================================================
--- branches/freesurface/source/material_model/steinberger.cc	2014-04-23 16:07:13 UTC (rev 2561)
+++ branches/freesurface/source/material_model/steinberger.cc	2014-04-29 23:04:43 UTC (rev 2562)
@@ -816,8 +816,14 @@
   {
     ASPECT_REGISTER_MATERIAL_MODEL(Steinberger,
                                    "Steinberger",
-                                   "lookup viscosity from the paper of Steinberger/Calderwood"
-                                   "2006 and material data from a database generated by Perplex. "
+                                   "This material model looks up the viscosity from the tables that "
+                                   "correspond to the paper of Steinberger and Calderwood "
+                                   "2006 (``Models of large-scale viscous flow in the Earth's "
+                                   "mantle with constraints from mineral physics and surface observations'', "
+                                   "Geophys. J. Int., 167, 1461-1481, "
+                                   "\url{http://dx.doi.org/10.1111/j.1365-246X.2006.03131.x}) and material "
+                                   "data from a database generated by the thermodynamics code \texttt{Perplex}, "
+                                   "see \url{http://www.perplex.ethz.ch/}. "
                                    "The database builds upon the thermodynamic database by "
                                    "Stixrude 2011 and assumes a pyrolitic composition by "
                                    "Ringwood 1988. ")

Modified: branches/freesurface/tests/run_testsuite.cmake
===================================================================
--- branches/freesurface/tests/run_testsuite.cmake	2014-04-23 16:07:13 UTC (rev 2561)
+++ branches/freesurface/tests/run_testsuite.cmake	2014-04-29 23:04:43 UTC (rev 2562)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2013 by Matthias Maier
+# Copyright (C) 2013, 2014 by Matthias Maier
 #
 # This file is part of ASPECT.
 #
@@ -240,7 +240,7 @@
 MESSAGE("-- CTEST_SITE:             ${CTEST_SITE}")
 
 IF( "${TRACK}" STREQUAL "Regression Tests"
-    AND NOT CTEST_SITE MATCHES "c0541" )
+    AND NOT CTEST_SITE MATCHES "tester" )
   MESSAGE(FATAL_ERROR "
 I'm sorry ${CTEST_SITE}, I'm afraid I can't do that.
 The TRACK \"Regression Tests\" is not for you.