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.

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

Add functionality for spherical system #5629

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 5 additions & 15 deletions source/geometry_model/initial_topography_model/function.cc
Original file line number Diff line number Diff line change
Expand Up @@ -67,29 +67,19 @@ namespace aspect
// Now for the vertical component:
global_point[dim-1] = 0;

// The point as it is would have to be translated into a different
// coordinate system if that was requested in the input file.
// This is not currently implemented.
Assert (coordinate_system == Utilities::Coordinates::CoordinateSystem::cartesian,
ExcNotImplemented());
ExcMessage("While using a box geometry, use cartesian coordinate system."));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you want to say

Suggested change
ExcMessage("While using a box geometry, use cartesian coordinate system."));
ExcMessage("While using a box geometry, you can only use the cartesian coordinate system."));

?

}
else if (Plugins::plugin_type_matches<GeometryModel::Sphere<dim>>(this->get_geometry_model()) ||
Plugins::plugin_type_matches<GeometryModel::SphericalShell<dim>>(this->get_geometry_model()) ||
Plugins::plugin_type_matches<GeometryModel::Chunk<dim>>(this->get_geometry_model()) )
{
std::array<double, dim> point;
point[0] = 6371000.0;
global_point[0] = 6371000.0;
for (unsigned int d=0; d<dim-1; ++d)
point[d+1] = surface_point[d];
global_point[d+1] = surface_point[d];

global_point = Utilities::Coordinates::spherical_to_cartesian_coordinates<dim>(point);

// The point as it is would have to be translated into a different
// coordinate system (or, perhaps, better just left in the spherical
// coordinates we received) if that was requested in the input file.
// This is not currently implemented.
Assert (coordinate_system == Utilities::Coordinates::CoordinateSystem::cartesian,
ExcNotImplemented());
Assert (coordinate_system == Utilities::Coordinates::CoordinateSystem::spherical,
ExcMessage("Make sure that you are using a spherical coordinate system While using a spherical geometry."));
Comment on lines +81 to +82
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Assert (coordinate_system == Utilities::Coordinates::CoordinateSystem::spherical,
ExcMessage("Make sure that you are using a spherical coordinate system While using a spherical geometry."));
Assert (coordinate_system == Utilities::Coordinates::CoordinateSystem::spherical,
ExcMessage("Make sure that you are using a spherical coordinate system while using a spherical geometry."));

Comment on lines +81 to +82
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Move the assertion to the top of the code block. Everything in this block is wrong if the assertion is not satisfied, we might as well abort there.

}
else
AssertThrow(false, ExcNotImplemented());
Expand Down
Loading