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

Require fields of type entropy in entropy assembler and adiabatic con… #5297

Merged
merged 2 commits into from Jul 13, 2023

Conversation

jdannberg
Copy link
Contributor

…ditions. Rather than asking for the name, the changes in #5246 and #5039 allow us to now check the field type.

I haven't done this in the material model yet since @RanpengLi is changing things in the same file but we should do it there as well.

For all pull requests:

Copy link
Contributor

@bangerth bangerth left a comment

Choose a reason for hiding this comment

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

Yes, much nicer -- I like asking rather than assuming :-)

Comment on lines 285 to 286
assemblers.advection_system[entropy_index].resize(1);
assemblers.advection_system[entropy_index][0] = std::make_unique<Assemblers::EntropyAdvectionSystem<dim>>();
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
assemblers.advection_system[entropy_index].resize(1);
assemblers.advection_system[entropy_index][0] = std::make_unique<Assemblers::EntropyAdvectionSystem<dim>>();
assemblers.advection_system[entropy_index].clear();
assemblers.advection_system[entropy_index].emplace_back (std::make_unique<Assemblers::EntropyAdvectionSystem<dim>>());

@jdannberg
Copy link
Contributor Author

I've addressed your one comment (I also changed it for the temperature just above).

@bangerth bangerth merged commit b814f88 into geodynamics:main Jul 13, 2023
6 checks passed
@jdannberg jdannberg deleted the use_entropy_field_type branch July 15, 2023 04:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants