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

Multicomponent equation of state #3075

Merged
merged 3 commits into from May 31, 2019

Conversation

jdannberg
Copy link
Contributor

This is another pull request based on #3036 (so only the last commit is new).
It adds an equation of state for multicomponent models and uses it in 4 different material models. There is another material model where this could potentially be used, which is the diffusion_dislocation model. The difference here is that diffusion_dislocation only has one value for the specific heat (but a vector with entries for each composition for the densities and thermal expansivities). This may be worth changing.
What do you think?

@jdannberg jdannberg force-pushed the multicomponent_eos branch 2 times, most recently from a2a6585 to 1cbf07f Compare May 29, 2019 15:51
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.

I think this looks pretty obvious, but it's a lot of code churn. If #3036 is merged, please rebase and then let's see whether the tester is happy with the result.

@jdannberg
Copy link
Contributor Author

This is now rebased to the current master.

@bangerth
Copy link
Contributor

There are two failing tests:

	656 - viscoelastic_bending_beam (Failed)
	659 - viscoelastic_plastic_bending_beam (Failed)

@jdannberg
Copy link
Contributor Author

I updated the test results. The only difference was a change in iteration count.

Copy link
Member

@gassmoeller gassmoeller left a comment

Choose a reason for hiding this comment

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

Very nice. Please address my documentation comments, and then this is ready.


/**
* Read the parameters this class declares from the parameter file.
* The optional parameter @p n_compositions determines the maximum
Copy link
Member

Choose a reason for hiding this comment

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

There is no optional parameter here.


/**
* Declare the parameters this class takes through input files.
* The optional parameter @p n_compositions determines the maximum
Copy link
Member

Choose a reason for hiding this comment

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

There is a different optional parameter here.



private:
// Vector of reference densities $\rho_0$ with one entry per composition,
Copy link
Member

Choose a reason for hiding this comment

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

Make these comments into doxygen documentation: /** ... */. Same for all parameters below.

has_background_field,
"Specific heats");
}

Copy link
Member

Choose a reason for hiding this comment

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

Remove empty line

@jdannberg
Copy link
Contributor Author

I addressed your comments.

@gassmoeller gassmoeller merged commit 01fa6be into geodynamics:master May 31, 2019
@jdannberg jdannberg deleted the multicomponent_eos branch June 14, 2019 14:11
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

3 participants