Skip to content

Physics (PBL, Convection and Microphysics) Update for HR2#653

Merged
jkbk2004 merged 6 commits into
NOAA-EMC:developfrom
Qingfu-Liu:update_HR2
May 9, 2023
Merged

Physics (PBL, Convection and Microphysics) Update for HR2#653
jkbk2004 merged 6 commits into
NOAA-EMC:developfrom
Qingfu-Liu:update_HR2

Conversation

@Qingfu-Liu
Copy link
Copy Markdown
Collaborator

Description
This PR is the same as PR#651, which has been reviewed and accidently closed. This new PR is created because the ccpp-physics is updated for HR2 (PR#65). This ccpp-physics update in PR#65 includes update for PBL scheme, shallow convection scheme, deep convection scheme and microphysics scheme. The changes of the physics improve hurricane forecast, and CAPE forecast values.

Issue(s) addressed
Improve hurricane intensity and surface CAPE forecast. For more information, see the description in physics PR#65

Testing
Baseline results will change. Running on Hera

Dependencies

Depends on ccpp-physics PR#65

@Qingfu-Liu Qingfu-Liu changed the title Update hr2 Physics (PBL, Convection and Microphysics) Update for HR2 Apr 29, 2023
@jkbk2004
Copy link
Copy Markdown
Collaborator

jkbk2004 commented May 9, 2023

@Qingfu-Liu ccpp pr was merged. can you update hash and revert change in gitmodules? correct hash is ufs-community/ccpp-physics@3a306a4

@grantfirl
Copy link
Copy Markdown
Collaborator

grantfirl commented May 9, 2023

@Qingfu-Liu ufs-community/ccpp-physics#65 has merged. Now, you need to update your fv3atm PR branch to point to the latest ufs-dev branch of ccpp-physics:

  1. On your local machine, go into the ccpp/physics directory and do git checkout ufs/dev and git pull origin ufs/dev (assuming that the ufs-community fork is labeled as "origin" when doing a git remote -v; otherwise, substitute "origin" for whichever fork is pointing to ufs-community). This pulls in the just-merged physics code to point fv3atm to.
  2. cd up to FV3 and make sure that you're in your [update_HR2](https://github.com/Qingfu-Liu/fv3atm/tree/update_HR2) branch.
  3. git add ccpp/physics
  4. edit .gitmodules back to the way it was (pointing to the ufs-community fork of ccpp-physics and the ufs/dev branch) and git add .gitmodules
  5. git commit -m "update ccpp/physics submodule pointer and .gitmodules"
  6. git push -u your-fork (where "your-fork" is the name of the fork pointing to your fork of fv3atm when doing a git remote -v)

@Qingfu-Liu
Copy link
Copy Markdown
Collaborator Author

Qingfu-Liu commented May 9, 2023 via email

@grantfirl
Copy link
Copy Markdown
Collaborator

Hi Grant, Got error message at step 6:
cd /scratch1/NCEPDEV/global/Qingfu.Liu/git/ufs-weather-model/FV3 git remote -v
origin https://github.com/Qingfu-Liu/fv3atm (fetch) origin https://github.com/Qingfu-Liu/fv3atm (push) upstream https://github.com/NOAA-EMC/fv3atm (fetch) upstream https://github.com/NOAA-EMC/fv3atm (push) After change .gitmodules
git add .gitmodules ccpp/physics git push -u origin
fatal: The current branch update_HR2 has no upstream branch. To push the current branch and set the remote as upstream, use git push --set-upstream origin update_HR2 Do you know what is wrong with this (I am also looking online)? Thanks Qingfu

On Tue, May 9, 2023 at 1:21 PM Grant Firl @.> wrote: @Qingfu-Liu https://github.com/Qingfu-Liu ufs-community/ccpp-physics#65 <ufs-community/ccpp-physics#65> has merged. Now, you need to update your fv3atm PR branch to point to the latest ufs-dev branch of ccpp-physics: 1. On your local machine, go into the ccpp/physics directory and do git checkout ufs-dev and git pull origin ufs-dev (assuming that the ufs-community fork is labeled as "origin" when doing a git remote -v; otherwise, substitute "origin" for whichever fork is pointing to ufs-community). This pulls in the just-merged physics code to point fv3atm to. 2. cd up to FV3 and make sure that you're in your update_HR2 branch. 3. git add ccpp/physics 4. edit .gitmodules back to the way it was (pointing to the ufs-community fork of ccpp-physics and the ufs-dev branch) and git add .gitmodules 5. git commit -m "update ccpp/physics submodule pointer and .gitmodules" 6. git push -u your-fork (where "your-fork" is the name of the fork pointing to your fork of fv3atm when doing a git remote -v) — Reply to this email directly, view it on GitHub <#653 (comment)>, or unsubscribe https://github.com/notifications/unsubscribe-auth/AGTS6UTC6UNGEB3PRV3ITHDXFJ4I5ANCNFSM6AAAAAAXQHR4RM . You are receiving this because you were mentioned.Message ID: @.>

@Qingfu-Liu Just do as git suggests: git push --set-upstream origin update_HR2

@Qingfu-Liu
Copy link
Copy Markdown
Collaborator Author

@grantfirl I just upload the changes, if there is a problem, please let me know. Thanks

@grantfirl
Copy link
Copy Markdown
Collaborator

@Qingfu-Liu It looks perfect. You'll need to do the same thing with ufs-weather-model as soon as this fv3atm PR is merged.

@jkbk2004
Copy link
Copy Markdown
Collaborator

jkbk2004 commented May 9, 2023

@Qingfu-Liu I am merging this pr now.

@jkbk2004 jkbk2004 merged commit 160b422 into NOAA-EMC:develop May 9, 2023
@Qingfu-Liu
Copy link
Copy Markdown
Collaborator Author

Qingfu-Liu commented May 9, 2023 via email

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.

5 participants