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

HR4 Gravity Wave Drag Update #836

Merged
merged 34 commits into from
Jul 10, 2024
Merged

Conversation

Qingfu-Liu
Copy link
Collaborator

@Qingfu-Liu Qingfu-Liu commented May 18, 2024

Description

(Instructions: this, and all subsequent sections of text should be removed and filled in as appropriate.)
Provide a detailed description of what this PR does.
This PR#836 depends ccpp-physics PR#207.

  1. This update is a combination of the gravity wave drag (GWD) versions from the NOAA/GSL and NOAA/PSL

  2. The test results with this update can be seen in:
    a) summer: https://www.emc.ncep.noaa.gov/gmb/jhan/vsdbw/hr3e50s
    b) winter: https://www.emc.ncep.noaa.gov/gmb/jhan/vsdbw/hr3d11w
    HR4GWD: same as HR3 but with the updated GWD

    Compared to the HR2 and HR3, the HR4GWD shows a significant improvement especially in 500mb height AC and CONUS precipitation forecast skills. The HR4GWD reduces the cold and dry biases in the lower troposphere compared to the HR3. It also reduces the negative wind speed biases in the troposphere compared to the HR2.

Is a change of answers expected from this PR?
Yes. Change of answers is expected

Issue(s) addressed

Gravity Wave Drag Update for HR4

Testing

How were these changes tested?
yes. see previous description

Are the changes covered by regression tests? (If not, why? Do new tests need to be added?)
No. Need to create new input.nml and new fix file ugwd
Have the ufs-weather-model regression test been run? On what platform?
Regression test has not been run.

  • Will the code updates change regression test baseline? If yes, why? Please show the baseline directory below.
  • Please commit the regression test log files in your ufs-weather-model branch

Dependencies

If testing this branch requires non-default branches in other repositories, list them.
Those branches should have matching names (ideally)
Tests need new input.nml file and new fix file ugwd
Do PRs in upstream repositories need to be merged first?
None

@Qingfu-Liu Qingfu-Liu marked this pull request as draft May 18, 2024 20:26
@DusanJovic-NOAA
Copy link
Collaborator

Please see the build error messages in the CI build, here:

https://github.com/NOAA-EMC/fv3atm/actions/runs/9142433918/job/25137982061?pr=836#step:6:2123

@Qingfu-Liu
Copy link
Collaborator Author

Please see the build error messages in the CI build, here:

https://github.com/NOAA-EMC/fv3atm/actions/runs/9142433918/job/25137982061?pr=836#step:6:2123

@DusanJovic-NOAA Thanks. I will contact Lisa to see if she can fix this problem.

Copy link
Contributor

@JongilHan66 JongilHan66 left a comment

Choose a reason for hiding this comment

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

In "GFS_typedefs.F90", "use_lake2m" is defined as "logical". But in "GFS_typedefs.meta", it is defined as "integer", which should be "logical"

Copy link
Contributor

@JongilHan66 JongilHan66 left a comment

Choose a reason for hiding this comment

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

I found that in ...../ccpp/physics/physics/SFC_Layer/UFS/sfc_diag.meta, "use_lake2m" was also defined as integer

@Qingfu-Liu
Copy link
Collaborator Author

Something wrong with my newly commit. Not sure why the commit upload all the files, working to fix the problem. Please postpone the review

@Qingfu-Liu
Copy link
Collaborator Author

Fixed the compile problem. This PR#836 is ready for review

@Qingfu-Liu Qingfu-Liu marked this pull request as ready for review May 26, 2024 18:40
@DusanJovic-NOAA
Copy link
Collaborator

Please list the ccpp/physics PR that this PR depends on

@Qingfu-Liu
Copy link
Collaborator Author

Please list the ccpp/physics PR that this PR depends on

@DusanJovic-NOAA Thanks. I will add it to the description section. Currently, I am still working on the compile issues from the new gravity code I was given this week. Will upload the new code after fix the compile issues

@Qingfu-Liu
Copy link
Collaborator Author

@Qingfu-Liu Once Qingfu-Liu#1 is merged, this PR should be good.

@grantfirl merged. Thank you very much

@grantfirl
Copy link
Collaborator

@Qingfu-Liu Could you please point the ccpp-framework to this: NCAR/ccpp-framework#549 (and update .gitmodules). This should not affect regression testing at all (it has already been tested independently on Hera).

@Qingfu-Liu
Copy link
Collaborator Author

Qingfu-Liu commented Jun 6, 2024

@Qingfu-Liu Could you please point the ccpp-framework to this: NCAR/ccpp-framework#549 (and update .gitmodules). This should not affect regression testing at all (it has already been tested independently on Hera).

@grantfirl Currently, the ccpp-framework points to NCAR/ccpp-framework. Where should I change in order to make the ccpp-framework point to the NCAR/ccpp-framework#549 ? Thanks

[submodule "ccpp/framework"]
path = ccpp/framework
url = https://github.com/NCAR/ccpp-framework ==> should I change to NCAR/ccpp-framework#549 here?
branch = main

@grantfirl
Copy link
Collaborator

grantfirl commented Jun 6, 2024

@Qingfu-Liu Could you please point the ccpp-framework to this: NCAR/ccpp-framework#549 (and update .gitmodules). This should not affect regression testing at all (it has already been tested independently on Hera).

@grantfirl Currently, the ccpp-framework points to NCAR/ccpp-framework. Where should I change in order to make the ccpp-framework point to the NCAR/ccpp-framework#549 ? Thanks

[submodule "ccpp/framework"] path = ccpp/framework url = https://github.com/NCAR/ccpp-framework ==> should I change to NCAR/ccpp-framework#549 here? branch = main

Here is how I would do it:

  1. Make sure you're that you have the latest version of your HR4-GWD-update branch of fv3atm checked out.
  2. cd into ccpp/framework
  3. The PR branch of ccpp-framework is on the fork of peverwhee, so we need to add her fork as a remote: git add remote courtney-fork https://github.com/peverwhee/ccpp-framework
  4. git fetch courtney-fork to get the branches from her fork
  5. git checkout add_const_interface (this is the name of the branch that PR#549 points to)
  6. Double-check that the right commit of ccpp-framework is now checked out. It should be NCAR/ccpp-framework@6e165e5.
  7. cd up to the FV3 directory.
  8. git add ccpp/framework
  9. Edit .gitmodules as follows:
    [submodule "ccpp/framework"]
    path = ccpp/framework
    url = https://github.com/NCAR/ccpp-framework
    branch = main
    becomes
    [submodule "ccpp/framework"]
    path = ccpp/framework
    #url = https://github.com/NCAR/ccpp-framework
    #branch = main
    url = https://github.com/peverwhee/ccpp-framework
    branch = add_const_interface
  10. git add .gitmodules
  11. git commit -m "point to PR#549 of ccpp-framework"
  12. git push

This should do it! Let me know if you run into any trouble.

@grantfirl
Copy link
Collaborator

@Qingfu-Liu I also noticed that in .gitmodules, for ccpp-physics, you currently are pointing to the ufs/dev branch of your fork. The branch should match the ccpp-physics PR branch: HR4-GWD-update

@Qingfu-Liu
Copy link
Collaborator Author

@Qingfu-Liu I also noticed that in .gitmodules, for ccpp-physics, you currently are pointing to the ufs/dev branch of your fork. The branch should match the ccpp-physics PR branch: HR4-GWD-update

@grantfirl Thank you very much.

@Qingfu-Liu
Copy link
Collaborator Author

@Qingfu-Liu Could you please point the ccpp-framework to this: NCAR/ccpp-framework#549 (and update .gitmodules). This should not affect regression testing at all (it has already been tested independently on Hera).

@grantfirl Currently, the ccpp-framework points to NCAR/ccpp-framework. Where should I change in order to make the ccpp-framework point to the NCAR/ccpp-framework#549 ? Thanks
[submodule "ccpp/framework"] path = ccpp/framework url = https://github.com/NCAR/ccpp-framework ==> should I change to NCAR/ccpp-framework#549 here? branch = main

Here is how I would do it:

  1. Make sure you're that you have the latest version of your HR4-GWD-update branch of fv3atm checked out.
  2. cd into ccpp/framework
  3. The PR branch of ccpp-framework is on the fork of peverwhee, so we need to add her fork as a remote: git add remote courtney-fork https://github.com/peverwhee/ccpp-framework
  4. git fetch courtney-fork to get the branches from her fork
  5. git checkout add_const_interface (this is the name of the branch that PR#549 points to)
  6. Double-check that the right commit of ccpp-framework is now checked out. It should be NCAR/ccpp-framework@6e165e5.
  7. cd up to the FV3 directory.
  8. git add ccpp/framework
  9. Edit .gitmodules as follows:
    [submodule "ccpp/framework"]
    path = ccpp/framework
    url = https://github.com/NCAR/ccpp-framework
    branch = main
    becomes
    [submodule "ccpp/framework"]
    path = ccpp/framework
    #url = https://github.com/NCAR/ccpp-framework
    #branch = main
    url = https://github.com/peverwhee/ccpp-framework
    branch = add_const_interface
  10. git add .gitmodules
  11. git commit -m "point to PR#549 of ccpp-framework"
  12. git push

This should do it! Let me know if you run into any trouble.

@grantfirl Thank you very much for the help. I just changed the pointer of the ccpp/framework to NCAR/ccpp-framework#549

@Qingfu-Liu
Copy link
Collaborator Author

The changes of the NoahMP model (which are not used for HR4-GWD-update tests) have been retracted. All the regression tests are passed on Hera

.gitmodules Outdated Show resolved Hide resolved
@jkbk2004 jkbk2004 requested review from BrianCurtis-NOAA and DusanJovic-NOAA and removed request for DusanJovic-NOAA July 10, 2024 20:30
@jkbk2004 jkbk2004 merged commit 65fec7d into NOAA-EMC:develop Jul 10, 2024
6 checks passed
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.

6 participants