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

Test for multiple particle interpolation #6054

Merged

Conversation

gassmoeller
Copy link
Member

Follow-up to #6052 that adds additional safety checks for interpolation from multiple particle worlds, and tests that we can correctly interpolate particle properties from multiple particle worlds into compositional fields.

@gassmoeller
Copy link
Member Author

Related to #5877.

@gassmoeller gassmoeller force-pushed the test_for_multiple_particle_interpolation branch from 7e74678 to a0598b2 Compare October 4, 2024 10:49
@tjhei
Copy link
Member

tjhei commented Oct 4, 2024

Would you mind rebasing?

@gassmoeller gassmoeller force-pushed the test_for_multiple_particle_interpolation branch from e2554a6 to 61f4214 Compare October 5, 2024 14:18
@gassmoeller
Copy link
Member Author

Rebased.

particle_property_indices[world_index].push_back({advection_field,particle_property_index});
property_mask[world_index].set(particle_property_index,true);
}
}
}

for (unsigned int advection_field=0; advection_field<advection_fields.size(); ++advection_field)
Assert (advection_field_has_been_found[advection_field] == true,
Copy link
Member

Choose a reason for hiding this comment

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

would you mind adding advection_field to the error message?

@@ -306,9 +311,13 @@ namespace aspect
// If not: assume we find it in another world.
if (particle_property_manager.get_data_info().fieldname_exists(particle_property_and_component.first))
{
Assert (advection_field_has_been_found[advection_field] == false,
ExcMessage("The same advection field is mapped to particle properties in different particle worlds. This is not supported."));
Copy link
Member

Choose a reason for hiding this comment

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

same here

@gassmoeller gassmoeller force-pushed the test_for_multiple_particle_interpolation branch from ef2e6e6 to 920201e Compare October 7, 2024 09:21
@gassmoeller
Copy link
Member Author

Something like this?

@tjhei tjhei merged commit e746ba7 into geodynamics:main Oct 7, 2024
8 checks passed
@gassmoeller gassmoeller deleted the test_for_multiple_particle_interpolation branch October 8, 2024 08:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants