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

Updated sfc_nst.f, sfc_nst.meta, module_nst_water_prop.f90 and flake_… #588

Merged
merged 43 commits into from
Apr 19, 2021
Merged

Updated sfc_nst.f, sfc_nst.meta, module_nst_water_prop.f90 and flake_… #588

merged 43 commits into from
Apr 19, 2021

Conversation

YihuaWu-NOAA
Copy link
Collaborator

…driver.F90

@YihuaWu-NOAA
Copy link
Collaborator Author

YihuaWu-NOAA commented Mar 18, 2021 via email

@climbfuji
Copy link
Collaborator

Hi, Dom, I have answered the questions below for the parts I have modified. Please fix whitespaces (align &) at the end Yes, it has been fixed. You need to revert all these changes. Yes, they have been reverted. Thanks! Regards Yihua----------------------------------------------------Yihua Wu, Ph DI.M. Systems Group NOAA/NWS/NCEP/EMC 5830 University Research Court, Room: 2031 College Park, Maryland 20740, USA Phone: (301)-683-3691 Fax: (301)-683-3703

Thanks, Yihua. The only changes left are the arg table lines that you added and that shouldn't be there.

@YihuaWu-NOAA
Copy link
Collaborator Author

YihuaWu-NOAA commented Mar 19, 2021 via email

@climbfuji
Copy link
Collaborator

This PR is currently in a messed-up state, it shows 40 changed files, many of them from the last PR that went into master. I am adding the "do not merge" label until this is resolved.

@climbfuji
Copy link
Collaborator

@YihuaWu-NOAA this could be a github bug. I am going to close your PR and immediately reopen it, maybe that fixes it ...

@climbfuji
Copy link
Collaborator

closing/reopening to see if this fixes a github bug

@climbfuji climbfuji closed this Apr 16, 2021
@climbfuji climbfuji reopened this Apr 16, 2021
@climbfuji
Copy link
Collaborator

@climbfuji
Copy link
Collaborator

This PR has been pulled into #629 and will be merged automatically as part of it. Do not merge manually.

@climbfuji
Copy link
Collaborator

@YihuaWu-NOAA to expedite the process of merging this, we are going to work with PR #629 from now on. Please make sure that all changes are as you wanted them to be, if not let me know. I only fixed the github issues and reverted a few unnecessary formatting changes. Thanks!

climbfuji added a commit that referenced this pull request Apr 19, 2021
Wrapper for #588 (Updated sfc_nst.f, sfc_nst.meta, module_nst_water_prop.f90 and flake_driver.F90)
@climbfuji climbfuji merged commit 2d3b3c4 into NCAR:master Apr 19, 2021
HelinWei-NOAA pushed a commit to HelinWei-NOAA/ccpp-physics that referenced this pull request Feb 26, 2023
…th the Thompson microphysics scheme (NCAR#588)

* version worked for producing nifa and nwfa

* added mraerosol in typedef

* use ltaersol=.true. and merra2

* Add consistency check for Thompson aerosol options to GFS_typedefs.F90

* using field table instead of code change for mraerosol

* Updates and bug fixes for Thompson-Merra2

Co-authored-by: anning.cheng <[email protected]>
Co-authored-by: Dom Heinzeller <[email protected]>
Co-authored-by: AnningCheng-NOAA <[email protected]>
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.

6 participants