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

Merge NCAR main into gsl/develop #126

Merged
merged 213 commits into from
Mar 8, 2022

Conversation

christinaholtNOAA
Copy link
Collaborator

This PR merges the NCAR:main branch into gsl/develop. There were significant conflicts in two files:

physics/module_MYNNPBL_wrapper.F90
physics/module_MYNNPBL_wrapper.meta

@joeolson42 and @JeffBeck-NOAA Please pay close attention to these files to ensure they were merged properly!

I ran the model regression test suite on Jet with GNU and Hera with GNU and Intel, creating new baselines for each.

This PR should be merged before these PRs in NOAA-GSL's forks of fv3atm and ufs-weather-model:
NOAA-GSL/fv3atm#126
NOAA-GSL/ufs-weather-model#119

SMoorthi-emc and others added 30 commits October 1, 2021 16:45
grantfirl and others added 17 commits February 11, 2022 14:24
GPU-enabled version of Grell-Freitas convection
…(AKA spp_wts_mp); change to assumed-shape and reduce rank to match rank of input (i,k) instead of (i,j,k)
edit module_mp_thompson.F90 to remove optional keyword for rand_pert …
…assumed-shape in module_bl_mynn and module_sf_mynn
Fix the rest of the Cheyenne/GNU tests
Add support for Stochastically Perturbed Parameterizations (SPP) in FV3
@JeffBeck-NOAA
Copy link

JeffBeck-NOAA commented Mar 7, 2022

@christinaholtNOAA, everything looks good to me related to SPP in module_MYNNPBL_wrapper.F90 and module_MYNNPBL_wrapper.meta. Were there any conflicts in the actual MYNN routine (module_bl_mynn.F90)? Also, no conflicts in the other physics that have SPP (MYNN_SFC, RRTMG, Thompson MP, and GSL GWD)? If not, great!

@christinaholtNOAA
Copy link
Collaborator Author

@JeffBeck-NOAA There may have been a conflict in module_bl_mynn.F90, but it would have been straightforward, meaning I took care of it easily in the first round of the merge. IIRC, some variable declarations were misplaced in an obvious way. I had to go back and fix some issues in the build step with the merge of the other files I listed, and it was not completely obvious that I was doing the right thing.

@christinaholtNOAA
Copy link
Collaborator Author

@joeolson42 I would like to move forward with the merge of this set of PRs if you are good with the merge that I did here.

Copy link
Collaborator

@joeolson42 joeolson42 left a comment

Choose a reason for hiding this comment

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

The changes to the MYNN (sfc and pbl) look acceptable. Special thanks to the cleaning done by someone (spacing/alignment/etc).

The use of assumed-shape arrays within the PBL and sfclayer modules may not be needed if declared as optional and not used when not allocated. Assumed-shape declarations don't work in WRF-ARW, so this makes the code non-universal, but I can change it later.

Copy link
Collaborator

@SamuelTrahanNOAA SamuelTrahanNOAA left a comment

Choose a reason for hiding this comment

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

The CODEOWNERS should be updated to Christina and Sam, but that should be in a separate PR since it is not a merge of community repositories to GSL repositories and should be discussed separately.

@SamuelTrahanNOAA SamuelTrahanNOAA merged commit 8c2450b into NOAA-GSL:gsl/develop Mar 8, 2022
zhanglikate pushed a commit to zhanglikate/ccpp-physics that referenced this pull request Mar 1, 2024
fix missing or mis-matched variable types in nst_water_prop
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.