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

Gas+rad+rec EoS #267

Merged
merged 6 commits into from
Mar 14, 2022
Merged

Gas+rad+rec EoS #267

merged 6 commits into from
Mar 14, 2022

Conversation

themikelau
Copy link
Collaborator

Type of PR:
Bug fix and cleanup of gas+rad+rec EoS.

Description:

  • Read composition (X and Z) from infile when using gas+rad+rec EoS with fixed composition.
  • Move irecomb option to eos_gasradrec
  • Create subroutines read_options_eos_gasradrec, write_options_eos_gasradrec, eos_info_gasradrec, init_eos_gasradrec.

Testing:
Compiled with SETUP=star and wrote infile.

Did you run the bots? yes/no
Yes.

@jameswurster
Copy link
Contributor

In pull request 263, I made major modifications to eos.F90, including some reordering of the subroutines/functions for readability.
I suspect there may be some issues trying to merge both of these pull requests; I'm not sure how this will be rectified, but we shall see. I recently ran into similar issues when the structure of the Makefile was overhauled.

@themikelau
Copy link
Collaborator Author

Hi @jameswurster. While I anticipate a merge conflict, I think it will be pretty straightforward to resolve as the changes I have made are pretty self contained. And thanks for cleaning up the eos module.

@danieljprice danieljprice merged commit e225695 into master Mar 14, 2022
@danieljprice danieljprice deleted the eos-gasradrec branch March 14, 2022 10:00
s-neilson pushed a commit to s-neilson/phantom that referenced this pull request Mar 18, 2023
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.

3 participants