[cig-commits] [commit] master: Compacted one of the lines to more closely match the way it was in geodynamics/master (b7b1d1b)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/5b2b586a4f29499284711e77f2cb8d5a0bc64afe...80f462a3e073ac705f736fd43243a28f9833c866

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

commit b7b1d1b023a0947527642f494f1fcf9e5f20022e
Author: Jonathan Perry-Houts <jperryh2 at uoregon.edu>
Date:   Wed May 21 16:47:50 2014 -0700

    Compacted one of the lines to more closely match the way it was in geodynamics/master


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

b7b1d1b023a0947527642f494f1fcf9e5f20022e
 source/simulator/initial_conditions.cc | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/source/simulator/initial_conditions.cc b/source/simulator/initial_conditions.cc
index 20b8c61..dbf0815 100644
--- a/source/simulator/initial_conditions.cc
+++ b/source/simulator/initial_conditions.cc
@@ -72,11 +72,8 @@ namespace aspect
 // should probably ask AdvectionField how many fields there actually are
     for (unsigned int n=0; n<1+parameters.n_compositional_fields; ++n)
       {
-        AdvectionField advf = ((n == 0)
-            ?
-                AdvectionField::temperature()
-        :
-                AdvectionField::composition(n-1));
+        AdvectionField advf = ((n == 0) ? AdvectionField::temperature()
+        : AdvectionField::composition(n-1));
 
         initial_solution.reinit(system_rhs, false);