astyle.

geodynamics · Feb 28, 2018 · ac4b5fc · ac4b5fc
1 parent 5a025ad
commit ac4b5fc
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/source/material_model/drucker_prager.cc b/source/material_model/drucker_prager.cc
@@ -67,19 +67,19 @@ namespace aspect
               // where e_dot_dev is the deviatoric strain rate tensor. The square root of this quantity
               // gives the common definition of effective strain rate.
               const double edot_ii_strict = (this->simulator_is_initialized() == false
-              ?
-              // no simulator object available -- we are probably in a unit test
-              std::fabs(second_invariant(strain_rate_deviator))
-              :
-              // simulator object is available, but we need to treat the
-              // first time step separately
-              ((this->get_timestep_number() == 0)
-               &&
-               (in.strain_rate[i].norm() <= std::numeric_limits<double>::min())
-               ?
-               reference_strain_rate * reference_strain_rate
-               :
-               std::fabs(second_invariant(strain_rate_deviator))));
+                                             ?
+                                             // no simulator object available -- we are probably in a unit test
+                                             std::fabs(second_invariant(strain_rate_deviator))
+                                             :
+                                             // simulator object is available, but we need to treat the
+                                             // first time step separately
+                                             ((this->get_timestep_number() == 0)
+                                              &&
+                                              (in.strain_rate[i].norm() <= std::numeric_limits<double>::min())
+                                              ?
+                                              reference_strain_rate * reference_strain_rate
+                                              :
+                                              std::fabs(second_invariant(strain_rate_deviator))));
 
               const double sqrt3 = std::sqrt(3.0);