[cig-commits] [commit] master: Rename a member variable to conform to common style. Fix a text issue. (23760c6)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/8cd10da0b2e753ddd449a2bce24790abdb4af621...3407c2fccc8c98ef3939d3c2d29077b4d899ff4b

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

commit 23760c6c9bf7800bfc83f885307bac8d7b4b02a3
Author: Wolfgang Bangerth <bangerth at math.tamu.edu>
Date:   Mon May 19 14:43:43 2014 -0500

    Rename a member variable to conform to common style. Fix a text issue.


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

23760c6c9bf7800bfc83f885307bac8d7b4b02a3
 include/aspect/postprocess/dynamic_topography.h        | 8 +++-----
 source/postprocess/dynamic_topography.cc               | 6 +++---
 source/postprocess/visualization/dynamic_topography.cc | 2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/include/aspect/postprocess/dynamic_topography.h b/include/aspect/postprocess/dynamic_topography.h
index 879b636..eea328d 100644
--- a/include/aspect/postprocess/dynamic_topography.h
+++ b/include/aspect/postprocess/dynamic_topography.h
@@ -65,12 +65,10 @@ namespace aspect
 
       private:
         /**
-         * Parameters for anhydrous melting of peridotite after Katz, 2003
+         * A parameter that we read from the input file that denotes
+         * whether we should subtract the mean topography or not.
          */
-
-        //for the solidus temperature
-        bool Subtract_mean_DT;   // °C
-
+        bool subtract_mean_dyn_topography;
     };
   }
 }
diff --git a/source/postprocess/dynamic_topography.cc b/source/postprocess/dynamic_topography.cc
index c78705d..813d9c9 100644
--- a/source/postprocess/dynamic_topography.cc
+++ b/source/postprocess/dynamic_topography.cc
@@ -146,7 +146,7 @@ namespace aspect
           output << stored_values[i].first
                  << ' '
                  << stored_values[i].second -
-                 (Subtract_mean_DT
+                 (subtract_mean_dyn_topography
                   ?
                   average_topography
                   :
@@ -237,7 +237,7 @@ namespace aspect
       {
         prm.enter_subsection("Dynamic Topography");
         {
-          Subtract_mean_DT              = prm.get_bool("Subtract mean of dynamic topography");
+          subtract_mean_dyn_topography              = prm.get_bool("Subtract mean of dynamic topography");
         }
         prm.leave_subsection();
       }
@@ -264,7 +264,7 @@ namespace aspect
                                   "that sit along the top surface, we evaluate the stress and "
                                   "evaluate the component of it in the direction in which "
                                   "gravity acts. In other words, we compute "
-                                  "$\\sigma_{rr}={\\hat g}^T(2 \\eta \\varepsilon(\\mathbf u)-\frac 13 (\\textrm{div}\;\\mathbf u)I)\\hat g - p_d$ "
+                                  "$\\sigma_{rr}={\\hat g}^T(2 \\eta \\varepsilon(\\mathbf u)-\frac 13 (\\textrm{div}\\;\\mathbf u)I)\\hat g - p_d$ "
                                   "where $\\hat g = \\mathbf g/\\|\\mathbf g\\|$ is the direction of "
                                   "the gravity vector $\\mathbf g$ and $p_d=p-p_a$ is the dynamic "
                                   "pressure computed by subtracting the adiabatic pressure $p_a$ "
diff --git a/source/postprocess/visualization/dynamic_topography.cc b/source/postprocess/visualization/dynamic_topography.cc
index 946b259..cad0d99 100644
--- a/source/postprocess/visualization/dynamic_topography.cc
+++ b/source/postprocess/visualization/dynamic_topography.cc
@@ -125,7 +125,7 @@ namespace aspect
                                                   "dynamic topography requires us to compute the stress tensor and "
                                                   "evaluate the component of it in the direction in which "
                                                   "gravity acts. In other words, we compute "
-                                                  "$\\sigma_{rr}={\\hat g}^T(2 \\eta \\varepsilon(\\mathbf u)-\frac 13 (\\textrm{div}\;\\mathbf u)I)\\hat g - p_d$ "
+                                                  "$\\sigma_{rr}={\\hat g}^T(2 \\eta \\varepsilon(\\mathbf u)-\frac 13 (\\textrm{div}\\;\\mathbf u)I)\\hat g - p_d$ "
                                                   "where $\\hat g = \\mathbf g/\\|\\mathbf g\\|$ is the direction of "
                                                   "the gravity vector $\\mathbf g$ and $p_d=p-p_a$ is the dynamic "
                                                   "pressure computed by subtracting the adiabatic pressure $p_a$ "