Merge NCAR main into gsl/develop#126
Conversation
…onsistency checking
…none to 1 to match change in fv3atm
metadata units fix
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
christinaholtNOAA
requested review from
DomHeinzeller and
SamuelTrahanNOAA
as code owners
christinaholtNOAA
requested review from
JeffBeck-NOAA,
joeolson42 and
tanyasmirnova
|
@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! |
|
@JeffBeck-NOAA There may have been a conflict in |
|
@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. |
joeolson42
left a comment
joeolson42
left a comment
There was a problem hiding this comment.
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.
SamuelTrahanNOAA
left a comment
SamuelTrahanNOAA
left a comment
There was a problem hiding this comment.
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.
fix missing or mis-matched variable types in nst_water_prop
17 participants
This PR merges the NCAR:main branch into gsl/develop. There were significant conflicts in two files:
@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