Indent

source/material_model/melt_boukare.cc

@@ -511,7 +511,7 @@ namespace aspect
           double eq_melt_molar_fraction = this->melt_fraction(in.temperature[q],
                                                               this->get_adiabatic_conditions().pressure(in.position[q]),
                                                               bulk_composition,
-															  molar_volatiles_in_melt,
+                                                              molar_volatiles_in_melt,
                                                               solid_composition,
                                                               melt_composition);
 
@@ -748,15 +748,15 @@ namespace aspect
               melt_molar_fraction = melt_fraction(in.temperature[q],
                                                   this->get_adiabatic_conditions().pressure(in.position[q]),
                                                   bulk_composition,
-												  molar_volatiles_in_melt,
+                                                  molar_volatiles_in_melt,
                                                   solid_composition,
                                                   melt_composition);
 
               if (boukare_out != nullptr)
-              {
-                boukare_out->bulk_composition[q] = bulk_composition;
-                boukare_out->molar_volatiles_in_melt[q] = molar_volatiles_in_melt;
-              }
+                {
+                  boukare_out->bulk_composition[q] = bulk_composition;
+                  boukare_out->molar_volatiles_in_melt[q] = molar_volatiles_in_melt;
+                }
 
               // We have to compute the update to the melt fraction in such a way that the bulk composition is conserved.
               const double change_of_melt_composition = reaction_fraction * limit_update_to_0_and_1(old_melt_composition, melt_composition - old_melt_composition);

tests/boukare_bulk_composition.prm

@@ -1,8 +1,8 @@
 # Simplified setup of convection in the lowermost mantle
-# on a small scale, but melt is not allowed to move. 
-# That means that the bulk composition should be conserved 
-# everywhere in the domain at 0.07 
-# (except maybe at the inflow boundary). 
+# on a small scale, but melt is not allowed to move.
+# That means that the bulk composition should be conserved
+# everywhere in the domain at 0.07
+# (except maybe at the inflow boundary).
 
 set Dimension                              = 2
 
@@ -120,7 +120,7 @@ subsection Heating model
   subsection Latent heat melt
     set Melting entropy change = 0
     set Retrieve entropy change from material model = true
-  end 
+  end
 end
 
 
@@ -214,4 +214,3 @@ subsection Postprocess
     end
   end
 end
-

tests/boukare_latent_heat.prm

@@ -1,13 +1,13 @@
 # This is a test for the latent heat release and consumption
-# in the melt boukare material model. The initial temperature 
+# in the melt boukare material model. The initial temperature
 # is set to a value that is out of equilibrium with the initial
-# porosity in the model, specifically, it is set so high that 
-# the energy released by reducing the temperature to the solidus 
-# allows for melting of approximately 10% of the material. This 
-# means that the steady-state melt fraction at the end of the 
-# model run should be 0.1. 
+# porosity in the model, specifically, it is set so high that
+# the energy released by reducing the temperature to the solidus
+# allows for melting of approximately 10% of the material. This
+# means that the steady-state melt fraction at the end of the
+# model run should be 0.1.
 # The test also outputs the bulk composition to make sure it is
-# conserved (it should be 0.001). 
+# conserved (it should be 0.001).
 
 set Dimension                              = 2
 
@@ -109,7 +109,7 @@ subsection Heating model
   subsection Latent heat melt
     set Melting entropy change = 0
     set Retrieve entropy change from material model = true
-  end 
+  end
 end
 
 
@@ -163,4 +163,3 @@ subsection Postprocess
     end
   end
 end
-

tests/boukare_melting_diagram.prm

@@ -1,7 +1,7 @@
 # This is a test for the melt fraction computation.
 # The gnuplot output of time step zero should show the binary loop
-# melting model, with a zero melt fraction below the solidus, 
-# and a melt fraction of 1 above the solidus. 
+# melting model, with a zero melt fraction below the solidus,
+# and a melt fraction of 1 above the solidus.
 
 # At the top, we define the number of space dimensions we would like to
 # work in:
@@ -99,7 +99,7 @@ end
 
 
 subsection Heating model
-  set List of model names = 
+  set List of model names =
 end
 
 
@@ -174,5 +174,3 @@ subsection Checkpointing
   # checkpoint step frequency instead. Units: Seconds.
   set Time between checkpoint  = 900
 end
-
-

tests/melt_boukare_EOS.prm

@@ -67,7 +67,7 @@ end
 subsection Boundary velocity model
   set Zero velocity boundary indicators       = left, right, top, bottom
   set Prescribed velocity boundary indicators =
-  set Tangential velocity boundary indicators = 
+  set Tangential velocity boundary indicators =
 end
 
 subsection Boundary temperature model
@@ -151,4 +151,3 @@ subsection Postprocess
     end
   end
 end
-

tests/melt_boukare_averaging.prm

@@ -67,7 +67,7 @@ end
 subsection Boundary velocity model
   set Zero velocity boundary indicators       = left, right, top, bottom
   set Prescribed velocity boundary indicators =
-  set Tangential velocity boundary indicators = 
+  set Tangential velocity boundary indicators =
 end
 
 subsection Boundary temperature model
@@ -151,4 +151,3 @@ subsection Postprocess
     end
   end
 end
-

tests/melting_rate_test.prm

@@ -94,7 +94,7 @@ end
 
 
 subsection Heating model
-  set List of model names = 
+  set List of model names =
 end
 
 
@@ -163,5 +163,3 @@ subsection Postprocess
     end
   end
 end
-
-