-
Notifications
You must be signed in to change notification settings - Fork 237
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
alarshi
wants to merge
1
commit into
geodynamics:main
Choose a base branch
from
alarshi:function_in_spherical
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||||||
---|---|---|---|---|---|---|---|---|---|---|
|
@@ -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.")); | ||||||||||
} | ||||||||||
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
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
Comment on lines
+81
to
+82
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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()); | ||||||||||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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
?