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

Bugfix for calculating moist air density in init_atm_core #829

Merged
merged 1 commit into from
Aug 13, 2021

Conversation

liujake
Copy link
Contributor

@liujake liujake commented Mar 17, 2021

This is a one line bug fix, part of MPAS-JEDI modifications documented in this issue #789.

When calculating moist air density, should use virtual temperature instead of temperature.

Tv = T*(1+0.608*qv)

@snyderdad snyderdad mentioned this pull request Mar 18, 2021
8 tasks
@mgduda mgduda self-requested a review April 20, 2021 18:20
@mgduda mgduda changed the base branch from develop to hotfix-v7.1 April 20, 2021 18:20
@mgduda mgduda changed the base branch from hotfix-v7.1 to develop April 20, 2021 18:21
@mgduda
Copy link
Contributor

mgduda commented Apr 21, 2021

@liujake If you could base the bugfix_t2tv branch off of the master branch, we can merge this PR to the hotfix-v7.1 branch rather than the develop branch. I'll be glad to help with the rebase -- just let me know.

@liujake
Copy link
Contributor Author

liujake commented Apr 21, 2021

@mgduda I tried 'git rebase master' for this branch, looks like having some conflict. It will be easier to close this PR and do another one by creating a new branch based on master and do another PR. Is that Ok?

	modified:   src/core_init_atmosphere/mpas_init_atm_cases.F
@liujake
Copy link
Contributor Author

liujake commented Apr 21, 2021

@mgduda I have a new branch 'bugfix_t2tv_v7.1' in my fork, which is based off of 'master' (not hotfix-v7.1). I can make a PR against hotfix-v7.1 if that is ok to you.

@mgduda
Copy link
Contributor

mgduda commented Apr 22, 2021

@liujake Unless you need to preserve the current bugfix_t2tv branch as-is, you could also just force-push your bugfix_t2tv_v7.1 branch to bugfix_t2tv to automatically update this PR.

@liujake
Copy link
Contributor Author

liujake commented Apr 22, 2021

@mgduda Never did this way. Can you give me an exact command to use for 'git push --force ?' from local branch?

@mgduda
Copy link
Contributor

mgduda commented Apr 22, 2021

@liujake The following should work:

git clone [email protected]:liujake/MPAS-Model.git
cd MPAS-Model
git checkout bugfix_t2tv_v7.1
git push --force origin bugfix_t2tv_v7.1:bugfix_t2tv

@liujake
Copy link
Contributor Author

liujake commented Apr 22, 2021

@mgduda I did force-push. I do not see how can I change PR target to hotfix-v7.1? Can you do the change?

@mgduda mgduda changed the base branch from develop to hotfix-v7.1 April 22, 2021 19:11
@mgduda
Copy link
Contributor

mgduda commented Apr 22, 2021

@liujake I just updated the base of this PR to hotfix-v7.1. For future reference, you can do this by clicking on the "Edit" button to the right of the PR title. This will allow you to not only edit the title of the PR, but also the base branch.

Thanks for providing this fix!

@mgduda mgduda requested a review from skamaroc April 22, 2021 19:12
@mgduda mgduda changed the title Bugfix for calculating mosit air density in init_atm_core Bugfix for calculating moist air density in init_atm_core Jun 15, 2021
@mgduda mgduda merged commit 310e962 into MPAS-Dev:hotfix-v7.1 Aug 13, 2021
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.

2 participants