Consistently order what functions return.

Author: bangerth

include/aspect/boundary_temperature/dynamic_core.h

@@ -496,22 +496,22 @@ namespace aspect
         compute_gravity_heating(const double Tc, const double r, const double X) const;
 
         /**
-         * Calculate entropy (@p Ek) and energy (@p Qk) change rate factor
+         * Calculate energy (@p Qk) and entropy (@p Ek) change rate factor
          * (regarding the core cooling rate Tc/dt) for a given @p Tc (CMB temperature)
          *
-         * @return A pair of (Ek, Qk), i.e., the entropy change rate factor first
-         * and the energy change rate factor second.
+         * @return A pair of (Qk, Ek), i.e., the energy change rate factor first
+         * and the entropy change rate factor second.
          */
         std::pair<double,double>
         compute_adiabatic_heating(const double Tc) const;
 
         /**
-         * Calculate entropy (@p El) and energy (@p Ql) change rate factor
+         * Calculate energy (@p Ql) and entropy (@p El) change rate factor
          * (regarding the inner core growth rate dR/dt) for a given @p Tc (CMB temperature)
          * and @p r (inner core radius)
          *
-         * @return A pair of (El, Ql), i.e., the entropy change rate factor first
-         * and the energy change rate factor second.
+         * @return A pair of (Ql, El), i.e., the energy change rate factor first
+         * and the entropy change rate factor second.
          */
         std::pair<double,double>
         compute_latent_heating(const double Tc, const double r) const;

source/boundary_temperature/dynamic_core.cc

@@ -515,8 +515,8 @@ namespace aspect
       std::tie(core_data.Qs,core_data.Es) = compute_specific_heating(core_data.Ti);
       std::tie(core_data.Qr,core_data.Er) = compute_radio_heating(core_data.Ti);
       std::tie(core_data.Qg,core_data.Eg) = compute_gravity_heating(core_data.Ti,core_data.Ri,core_data.Xi);
-      std::tie(core_data.Ek,core_data.Qk) = compute_adiabatic_heating(core_data.Ti);
-      std::tie(core_data.El,core_data.Ql) = compute_latent_heating(core_data.Ti,core_data.Ri);
+      std::tie(core_data.Qk,core_data.Ek) = compute_adiabatic_heating(core_data.Ti);
+      std::tie(core_data.Ql,core_data.El) = compute_latent_heating(core_data.Ti,core_data.Ri);
       core_data.Eh                        = compute_heat_solution(core_data.Ti,core_data.Ri,core_data.Xi);
     }
 
@@ -811,7 +811,7 @@ namespace aspect
 
       const double Ek = 16*numbers::PI*k_c*Utilities::fixed_power<5>(Rc)/5/Utilities::fixed_power<4>(D);
       const double Qk = 8*numbers::PI*Utilities::fixed_power<3>(Rc)*k_c*Tc/Utilities::fixed_power<2>(D);
-      return { Ek, Qk };
+      return { Qk, Ek };
     }
 
 
@@ -830,7 +830,7 @@ namespace aspect
 
       const double Ql = 4.*numbers::PI*Utilities::fixed_power<2>(r)*Lh*compute_rho(r);
       const double El = Ql*(compute_T(Tc,r)-Tc)/(Tc*compute_T(Tc,r));
-      return { El, Ql };
+      return { Ql, El };
     }