[cig-commits] [commit] master: Remove /m from unit (bac320f)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/1cea9a9309fea18bec922b55d3e1aed04c0372d2...0801e5573990bb6b2572872a2c084577ffc9fa4a

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

commit bac320f91887eb388e28d924be291f0d75714d53
Author: anne-glerum <a.c.glerum at uu.nl>
Date:   Thu May 22 23:49:35 2014 +0200

    Remove /m from unit


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

bac320f91887eb388e28d924be291f0d75714d53
 source/postprocess/viscous_dissipation_statistics.cc | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/source/postprocess/viscous_dissipation_statistics.cc b/source/postprocess/viscous_dissipation_statistics.cc
index a72f388..5e866ae 100644
--- a/source/postprocess/viscous_dissipation_statistics.cc
+++ b/source/postprocess/viscous_dissipation_statistics.cc
@@ -120,28 +120,28 @@ namespace aspect
           // fill statistics file
           // make sure that the columns filled by this object
           // all show up with sufficient accuracy and in scientific notation
-          statistics.add_value ("Total viscous dissipation (J/yr/m)", viscous_dissipation * year_in_seconds);
-          statistics.set_precision ("Total viscous dissipation (J/yr/m)", 8);
-          statistics.set_scientific ("Total viscous dissipation (J/yr/m)", true);
+          statistics.add_value ("Total viscous dissipation (J/yr)", viscous_dissipation * year_in_seconds);
+          statistics.set_precision ("Total viscous dissipation (J/yr)", 8);
+          statistics.set_scientific ("Total viscous dissipation (J/yr)", true);
         }
       else
         {
           // fill statistics file
           // make sure that the columns filled by this object
           // all show up with sufficient accuracy and in scientific notation
-          statistics.add_value ("Total viscous dissipation (W/m)", viscous_dissipation);
-          statistics.set_precision ("Total viscous dissipation (W/m)", 8);
-          statistics.set_scientific ("Total viscous dissipation (W/m)", true);
+          statistics.add_value ("Total viscous dissipation (W)", viscous_dissipation);
+          statistics.set_precision ("Total viscous dissipation (W)", 8);
+          statistics.set_scientific ("Total viscous dissipation (W)", true);
         }
 
       std::ostringstream output;
       output.precision(3);
       if (this->convert_output_to_years() == true)
         output << viscous_dissipation *year_in_seconds
-               << " J/yr/m";
+               << " J/yr";
       else
         output << viscous_dissipation
-               << " W/m";
+               << " W";
 
       return std::pair<std::string, std::string> ("Total viscous dissipation:",
                                                   output.str());