[cig-commits] [commit] master: Removed lines that were commented out (cc0bea9)

[cig_noreply at geodynamics.org]

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

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

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

commit cc0bea9c885f7147f3ba0acac3389f9fe060a990
Author: anne-glerum <a.c.glerum at uu.nl>
Date:   Thu May 22 18:57:36 2014 +0200

    Removed lines that were commented out


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

cc0bea9c885f7147f3ba0acac3389f9fe060a990
 source/postprocess/viscous_dissipation_statistics.cc | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/source/postprocess/viscous_dissipation_statistics.cc b/source/postprocess/viscous_dissipation_statistics.cc
index 8c42df6..44ad86e 100644
--- a/source/postprocess/viscous_dissipation_statistics.cc
+++ b/source/postprocess/viscous_dissipation_statistics.cc
@@ -98,14 +98,10 @@ namespace aspect
             // calculate the local viscous dissipation integral
             for (unsigned int q = 0; q < n_q_points; ++q)
               {
-/*                local_dissipation_integral += (2.0 * out.viscosities[q] * in.strain_rate[q].norm() *
+                local_dissipation_integral += (2.0 * out.viscosities[q] * in.strain_rate[q].norm() *
                                               in.strain_rate[q].norm() 
-                                              - in.pressure[q] * trace(in.strain_rate[q]))
-                                              * fe_values.JxW(q);
-*/                local_dissipation_integral += (2.0 * out.viscosities[q] * in.strain_rate[q].norm() *
-                                                in.strain_rate[q].norm() 
-                                              - in.pressure[q] * trace(in.strain_rate[q]))
-                                              * fe_values.JxW(q);
+                                            - in.pressure[q] * trace(in.strain_rate[q]))
+                                            * fe_values.JxW(q);
               }
           }
 
@@ -140,7 +136,7 @@ namespace aspect
                                   };
 
           statistics.add_value (columns[0], viscous_dissipation);
-          statistics.add_value (columns[1], viscous_dissipation/1000.0);
+          statistics.add_value (columns[1], viscous_dissipation / 1000.0);
 
           for (unsigned int i=0; i<sizeof(columns)/sizeof(columns[0]); ++i)
             {
@@ -154,7 +150,7 @@ namespace aspect
       if (this->convert_output_to_years() == true)
         output << viscous_dissipation * year_in_seconds
                << " J/yr/m"
-               << viscous_dissipation *year_in_seconds / 1000.0
+               << viscous_dissipation * year_in_seconds / 1000.0
                << " kJ/yr/m";
       else
         output << viscous_dissipation