Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Gravity std::pow() update #5226

Merged
merged 2 commits into from
Jul 9, 2023
Merged

Gravity std::pow() update #5226

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9755257
Replace pow(x,2) and pow(x,3) in gravity_point_values.cc
ryanstoner1 Jul 8, 2023
5ff5da6
Merge branch 'geodynamics:main' into gravity_pow_update
ryanstoner1 Jul 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 9 additions & 9 deletions source/postprocess/gravity_point_values.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,37 +398,37 @@ namespace aspect
// We are inside the inner radius
g_theory[p] = 0;
g_potential_theory[p] = 2.0 * G * numbers::PI * reference_density *
(std::pow(model_inner_radius,2) - std::pow(model_outer_radius,2));
((model_inner_radius * model_inner_radius) - (model_outer_radius * model_outer_radius));
}
else if ((satellite_positions_spherical[p][0] > model_inner_radius)
&& (satellite_positions_spherical[p][0] < model_outer_radius))
{
// We are in the spherical shell
g_theory[p] = G * numbers::PI * 4./3. * reference_density *
(satellite_positions_spherical[p][0] -
(std::pow(model_inner_radius,3)
/ std::pow(satellite_positions_spherical[p][0],2)));
((model_inner_radius * model_inner_radius * model_inner_radius)
/ (satellite_positions_spherical[p][0] * satellite_positions_spherical[p][0])));
g_potential_theory[p] = G * numbers::PI * 4./3. * reference_density *
((std::pow(satellite_positions_spherical[p][0],2)/2.0) +
(std::pow(model_inner_radius,3) / satellite_positions_spherical[p][0]))
(((satellite_positions_spherical[p][0] * satellite_positions_spherical[p][0])/2.0) +
((model_inner_radius * model_inner_radius * model_inner_radius) / satellite_positions_spherical[p][0]))
-
G * numbers::PI * 2.0 * reference_density *
std::pow(model_outer_radius,2);
(model_outer_radius * model_outer_radius);
}
else
{
const double common_factor = G * numbers::PI * 4./3. * reference_density
* (std::pow(model_outer_radius,3) - std::pow(model_inner_radius,3));
* ((model_outer_radius * model_outer_radius * model_outer_radius) - (model_inner_radius * model_inner_radius * model_inner_radius));
const double r = satellite_positions_spherical[p][0];

g_theory[p] = common_factor / std::pow(r,2);
g_theory[p] = common_factor / (r * r);
g_potential_theory[p] = - common_factor / r;

// For the gradient of g, start with the common part of
// the diagonal elements:
g_gradient_theory[p][0][0] =
g_gradient_theory[p][1][1] =
g_gradient_theory[p][2][2] = -1./std::pow(r,3);
g_gradient_theory[p][2][2] = -1./(r * r * r);

// Then do the off-diagonal elements:
for (unsigned int e=0; e<dim; ++e)
Expand Down