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

[PfemFluid] Add thermal coupling files #6511

Merged
merged 27 commits into from
May 4, 2020

Conversation

MZecchetto
Copy link
Contributor

Just that. Few notes:

Massimiliano

Copy link
Member

@ipouplana ipouplana left a comment

Choose a reason for hiding this comment

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

Hi @MZecchetto , why have you modified DamApplication files here ?

@MZecchetto
Copy link
Contributor Author

I never modified Dam files. now it should be ok

@ipouplana
Copy link
Member

I see that you are adding CLs here... I guess that you have the same changes as in PR #6504, right?
If so, I would first merge that PR and then, once you merge the updated master branch over this one, you can merge this PR too. Was that your idea ?

@MZecchetto
Copy link
Contributor Author

Yes, this is also my idea. I rebased this branch onto #6504 because I needed it. It was not 100% clear to me how the rebase is managed in a PR.

@MZecchetto MZecchetto merged commit 24c9763 into master May 4, 2020
@MZecchetto MZecchetto deleted the PfemFluid/add-thermal-coupling branch May 4, 2020 12:30
@AFranci AFranci restored the PfemFluid/add-thermal-coupling branch October 9, 2020 07:01
@AFranci AFranci deleted the PfemFluid/add-thermal-coupling branch June 22, 2022 13:37
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.

4 participants