Merge pull request #6055 from gassmoeller/avoid_pow

Replace std::pow where possible

Author: tjhei

benchmarks/burstedde/burstedde.cc

@@ -360,20 +360,20 @@ namespace aspect
 
       Tensor<1,dim> g;
 
-      g[0]=((y*z+3.*std::pow(x,2)*std::pow(y,3)*z)- mu*(2.+6.*x*y))
-           -dmudx*(2.+4.*x+2.*y+6.*std::pow(x,2)*y)
-           -dmudy*(x+std::pow(x,3)+y+2.*x*std::pow(y,2))
+      g[0]=((y*z+3.*Utilities::fixed_power<2>(x)*Utilities::fixed_power<3>(y)*z)- mu*(2.+6.*x*y))
+           -dmudx*(2.+4.*x+2.*y+6.*Utilities::fixed_power<2>(x)*y)
+           -dmudy*(x+Utilities::fixed_power<3>(x)+y+2.*x*Utilities::fixed_power<2>(y))
            -dmudz*(-3.*z-10.*x*y*z);
 
-      g[1]=((x*z+3.*std::pow(x,3)*std::pow(y,2)*z)- mu*(2.+2.*std::pow(x,2)+2.*std::pow(y,2)))
-           -dmudx*(x+std::pow(x,3)+y+2.*x*std::pow(y,2))
-           -dmudy*(2.+2.*x+4.*y+4.*std::pow(x,2)*y)
-           -dmudz*(-3.*z-5.*std::pow(x,2)*z);
+      g[1]=((x*z+3.*Utilities::fixed_power<3>(x)*Utilities::fixed_power<2>(y)*z)- mu*(2.+2.*Utilities::fixed_power<2>(x)+2.*Utilities::fixed_power<2>(y)))
+           -dmudx*(x+Utilities::fixed_power<3>(x)+y+2.*x*Utilities::fixed_power<2>(y))
+           -dmudy*(2.+2.*x+4.*y+4.*Utilities::fixed_power<2>(x)*y)
+           -dmudz*(-3.*z-5.*Utilities::fixed_power<2>(x)*z);
 
-      g[2]=((x*y+std::pow(x,3)*std::pow(y,3)) - mu*(-10.*y*z))
+      g[2]=((x*y+Utilities::fixed_power<3>(x)*Utilities::fixed_power<3>(y)) - mu*(-10.*y*z))
            -dmudx*(-3.*z-10.*x*y*z)
-           -dmudy*(-3.*z-5.*std::pow(x,2)*z)
-           -dmudz*(-4.-6.*x-6.*y-10.*std::pow(x,2)*y);
+           -dmudy*(-3.*z-5.*Utilities::fixed_power<2>(x)*z)
+           -dmudz*(-4.-6.*x-6.*y-10.*Utilities::fixed_power<2>(x)*y);
 
       return g;
     }

benchmarks/compressibility_formulations/plugins/compressibility_formulations.cc

@@ -155,7 +155,7 @@ namespace aspect
           if (this->get_parameters().formulation_mass_conservation ==
               Parameters<dim>::Formulation::MassConservation::isentropic_compression)
             {
-              out.compressibilities[i] = reference_compressibility - std::pow(thermal_expansivity, 2) * in.temperature[i]
+              out.compressibilities[i] = reference_compressibility - Utilities::fixed_power<2>(thermal_expansivity) * in.temperature[i]
                                          / (out.densities[i] * out.specific_heat[i]);
             }
         }

benchmarks/layeredflow/layeredflow.cc

@@ -54,10 +54,10 @@ namespace aspect
                             - beta*std::log(beta*beta+pow(1.-y0,2.0))+2.*(1.-y0)*std::atan(yminus)
                             + 2.*numbers::PI*(1.+2.*epsilon) );
 
-        const double C2 = ( beta*std::log( beta*beta+std::pow(1+y0,2.) )- 2.*(1.+y0)*std::atan(yplus)
+        const double C2 = ( beta*std::log( beta*beta+Utilities::fixed_power<2>(1+y0) )- 2.*(1.+y0)*std::atan(yplus)
                             + numbers::PI*(1.+2.*epsilon) )*C1 ;
         const double y = pos[1]-1.0;
-        const double v_x = (-beta*C1*std::log(beta*beta+std::pow(y-y0,2.0))+2.*(y-y0)*C1*std::atan((y-y0)/beta)
+        const double v_x = (-beta*C1*std::log(beta*beta+Utilities::fixed_power<2>(y-y0))+2.*(y-y0)*C1*std::atan((y-y0)/beta)
                             + numbers::PI*(1.+2.*epsilon)*y*C1+C2)/(2.*numbers::PI);
         const double v_y = 0;
         return Point<2> (v_x,v_y);

benchmarks/nsinker/nsinker.cc

@@ -292,7 +292,7 @@ namespace aspect
         {
           double dist = p.distance(Point<2>(centers[s](0), centers[s](1)));
           double temp = 1-std::exp(-delta*
-                                   std::pow(std::max(0.0,dist-omega/2.0),2));
+                                   Utilities::fixed_power<2>(std::max(0.0,dist-omega/2.0)));
           chi *= temp;
         }
       return chi;
@@ -310,7 +310,7 @@ namespace aspect
         {
           double dist = p.distance(centers[s]);
           double temp = 1-std::exp(-delta*
-                                   std::pow(std::max(0.0,dist-omega/2.0),2));
+                                   Utilities::fixed_power<2>(std::max(0.0,dist-omega/2.0)));
           chi *= temp;
         }
       return chi;

benchmarks/nsinker_spherical_shell/nsinker.cc

@@ -311,7 +311,7 @@ namespace aspect
         {
           double dist = p.distance(Point<2>(centers[s](0), centers[s](1)));
           double temp = 1-std::exp(-delta*
-                                   std::pow(std::max(0.0,dist-omega/2.0),2));
+                                   Utilities::fixed_power<2>(std::max(0.0,dist-omega/2.0)));
           chi *= temp;
         }
       return chi;
@@ -329,7 +329,7 @@ namespace aspect
         {
           double dist = p.distance(centers[s]);
           double temp = 1-std::exp(-delta*
-                                   std::pow(std::max(0.0,dist-omega/2.0),2));
+                                   Utilities::fixed_power<2>(std::max(0.0,dist-omega/2.0)));
           chi *= temp;
         }
       return chi;

benchmarks/solitary_wave/solitary_wave.cc

@@ -399,13 +399,13 @@ namespace aspect
 
         double length_scaling (const double porosity) const
         {
-          return std::sqrt(reference_permeability * std::pow(porosity,3) * (xi_0 + 4.0/3.0 * eta_0) / eta_f);
+          return std::sqrt(reference_permeability * Utilities::fixed_power<3>(porosity) * (xi_0 + 4.0/3.0 * eta_0) / eta_f);
         }
 
         double velocity_scaling (const double porosity) const
         {
           const Point<dim> surface_point = this->get_geometry_model().representative_point(0.0);
-          return reference_permeability * std::pow(porosity,2) * (reference_rho_s - reference_rho_f)
+          return reference_permeability * Utilities::fixed_power<2>(porosity) * (reference_rho_s - reference_rho_f)
                  * this->get_gravity_model().gravity_vector(surface_point).norm() / eta_f;
         }
 
@@ -451,7 +451,7 @@ namespace aspect
 
                 melt_out->compaction_viscosities[i] = xi_0 * (1.0 - porosity);
                 melt_out->fluid_viscosities[i]= eta_f;
-                melt_out->permeabilities[i]= reference_permeability * std::pow(porosity,3);
+                melt_out->permeabilities[i]= reference_permeability * Utilities::fixed_power<3>(porosity);
                 melt_out->fluid_densities[i]= reference_rho_f;
                 melt_out->fluid_density_gradients[i] = 0.0;
               }

benchmarks/solubility/plugin/solubility.cc

@@ -172,7 +172,7 @@ namespace aspect
               double porosity = std::max(in.composition[q][porosity_idx],0.0);
 
               fluid_out->fluid_viscosities[q] = eta_f;
-              fluid_out->permeabilities[q] = reference_permeability * std::pow(porosity,3) * std::pow(1.0-porosity,2);
+              fluid_out->permeabilities[q] = reference_permeability * Utilities::fixed_power<3>(porosity) * Utilities::fixed_power<2>(1.0-porosity);
 
               fluid_out->fluid_densities[q] = reference_rho_f * std::exp(fluid_compressibility * (in.pressure[q] - this->get_surface_pressure()));
 
@@ -387,7 +387,7 @@ namespace aspect
     reference_darcy_coefficient () const
     {
       // 0.01 = 1% melt
-      return reference_permeability * std::pow(0.01,3.0) / eta_f;
+      return reference_permeability * Utilities::fixed_power<3>(0.01) / eta_f;
     }
 
 

benchmarks/yamauchi_takei_2016_anelasticity/anelasticity_temperature.cc

@@ -290,7 +290,7 @@ namespace aspect
           isothermal_volume_change=r2.first;
           compressibility=isothermal_volume_change*std::exp((gruneisen_parameter+1)*(std::pow(isothermal_volume_change,-1)-1));
           pressure_dependent_density=reference_density*isothermal_volume_change;
-          integrated_thermal_expansivity=(2.832e-5*(temperature-273))+((0.758e-8/2)*(std::pow(temperature,2)-std::pow(273,2)));
+          integrated_thermal_expansivity=(2.832e-5*(temperature-273))+((0.758e-8/2)*(Utilities::fixed_power<2>(temperature)-Utilities::fixed_power<2>(273)));
           density=pressure_dependent_density*(1-(compressibility*integrated_thermal_expansivity));
         }
       // determine J1 term (real part of complex compliance)
@@ -299,8 +299,8 @@ namespace aspect
                                                                       std::erf((std::log(peak_period/normalized_period))/(std::sqrt(2)*peak_width)))));
       // determine J2 term (imaginary part of complex compliance)
       //double loss_compliance=unrelaxed_compliance*(M_PI/2)*(background_amplitude*(std::pow(normalized_period,background_slope))+
-      // (peak_amplitude*std::exp(-1*(std::pow(std::log(peak_period/normalized_period),2)/
-      // (2*std::pow(peak_width,2))))))+(unrelaxed_compliance*normalized_period);
+      // (peak_amplitude*std::exp(-1*(Utilities::fixed_power<2>(std::log(peak_period/normalized_period))/
+      // (2*Utilities::fixed_power<2>(peak_width))))))+(unrelaxed_compliance*normalized_period);
       // calculate anharmonic Vs
       // anharmonic_Vs=1/(std::sqrt(density*unrelaxed_compliance)*1e3);
       // calculate Vs

cookbooks/inner_core_convection/inner_core_convection.cc

@@ -175,7 +175,7 @@ namespace aspect
 
           // The gravity is zero in the center of the Earth, and we assume the density to be constant and equal to 1.
           // We fix the surface pressure to 0 (and we are only interested in pressure differences anyway).
-          return gravity_magnitude * 0.5 * (1.0 - std::pow(radius/max_radius,2));
+          return gravity_magnitude * 0.5 * (1.0 - Utilities::fixed_power<2>(radius/max_radius));
         }
       else
         return hydrostatic_pressure_profile.value(Point<1>(radius));

cookbooks/morency_doin_2004/morency_doin.cc

@@ -70,7 +70,7 @@ namespace aspect
              */
             const double e2inv = std::sqrt((strain_rate[0][0]*strain_rate[0][0] + strain_rate[0][1]*strain_rate[0][1])/2.0);
 
-            const double edot = std::sqrt(std::pow(e2inv,2) + std::pow(min_strain_rate,2));
+            const double edot = std::sqrt(Utilities::fixed_power<2>(e2inv) + Utilities::fixed_power<2>(min_strain_rate));
 
             // Calculate 1/(v_eff^v) and 1/(v_eff^p)
             double one_over_veffv = 0.0;