Skip to content

GSL precip type fix #730

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.

Sign up for GitHub

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

Merged
WenMeng-NOAA merged 6 commits into from
Jun 22, 2023
Merged

GSL precip type fix #730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
14a170d
Correcting 1h precip for GSL precip type analysis. We were previousl…
EricJames-NOAA Jun 15, 2023
d180a7a
Add change log.
EricJames-NOAA Jun 15, 2023
b7a4ed4
Merge remote-tracking branch 'origin/develop' into ptype_fix
EricJames-NOAA Jun 16, 2023
7a73177
Changing precip type variables in NATLEV files to GSL algorithm.
EricJames-NOAA Jun 21, 2023
b3d792d
Modifying intel.yml to try to address CI failures, based on suggestio…
EricJames-NOAA Jun 22, 2023
5f37c93
Change one last actions/cache instance.
EricJames-NOAA Jun 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/intel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ defaults:

# Set I_MPI_CC/F90 so Intel MPI wrapper uses icc/ifort instead of gcc/gfortran
env:
cache_key: intel2 # The number (#) following the cache_key "intel" is to flush Action cache.
cache_key: intel3 # The number (#) following the cache_key "intel" is to flush Action cache.
CC: icc
FC: ifort
CXX: icpc
Expand Down Expand Up @@ -45,7 +45,7 @@ jobs:
# Cache spack, compiler and dependencies
- name: cache-env
id: cache-env
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
spack
Expand Down Expand Up @@ -94,7 +94,7 @@ jobs:

- name: cache-env
id: cache-env
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
spack
Expand Down
8 changes: 4 additions & 4 deletions parm/fv3lam_rrfs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2416,28 +2416,28 @@
</param>

<param>
<shortname>INST_CRAIN_ON_SURFACE</shortname>
<shortname>GSD_INST_CRAIN_ON_SURFACE</shortname>
<pname>CRAIN</pname>
<table_info>NCEP</table_info>
<scale>1.0</scale>
</param>

<param>
<shortname>CSNOW_ON_SURFACE</shortname>
<shortname>GSD_CSNOW_ON_SURFACE</shortname>
<pname>CSNOW</pname>
<table_info>NCEP</table_info>
<scale>1.0</scale>
</param>

<param>
<shortname>CICEP_ON_SURFACE</shortname>
<shortname>GSD_CICEP_ON_SURFACE</shortname>
<pname>CICEP</pname>
<table_info>NCEP</table_info>
<scale>1.0</scale>
</param>

<param>
<shortname>CFRZR_ON_SURFACE</shortname>
<shortname>GSD_CFRZR_ON_SURFACE</shortname>
<pname>CFRZR</pname>
<table_info>NCEP</table_info>
<scale>1.0</scale>
Expand Down
24 changes: 12 additions & 12 deletions parm/postxconfig-NT-fv3lam_rrfs.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13132,9 +13132,9 @@ surface
?
?
?
160
INST_CRAIN_ON_SURFACE
?
407
GSD_INST_CRAIN_ON_SURFACE
GSD_instant precipitation type on surface
1
tmpl4_0
CRAIN
Expand Down Expand Up @@ -13169,9 +13169,9 @@ surface
?
?
?
551
CSNOW_ON_SURFACE
Categorical snow on surface
559
GSD_CSNOW_ON_SURFACE
GSD_Categorical snow on surface
1
tmpl4_0
CSNOW
Expand Down Expand Up @@ -13206,9 +13206,9 @@ surface
?
?
?
552
CICEP_ON_SURFACE
Categorical ice pellets on surface
560
GSD_CICEP_ON_SURFACE
GSD_Categorical ice pellets on surface
1
tmpl4_0
CICEP
Expand Down Expand Up @@ -13243,9 +13243,9 @@ surface
?
?
?
553
CFRZR_ON_SURFACE
Categorical freezing rain on surface
561
GSD_CFRZR_ON_SURFACE
GSD_Categorical freezing rain on surface
1
tmpl4_0
CFRZR
Expand Down
5 changes: 4 additions & 1 deletion sorc/ncep_post.fd/SURFCE.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
!> 2023-03-22 | S Trahan | Fixed out-of-bounds access calling BOUND with wrong array dimensions
!> 2023-04-21 | E James | Enabling GSL precip type for RRFS
!> 2023-05-19 | E James | Cleaning up GRIB2 encoding for 1-h max precip rate
!> 2023-06-15 | E James | Correcting bug fix in GSL precip type for RRFS (use 1h pcp, not run total pcp)
!>
!> @note
!> USAGE: CALL SURFCE
Expand Down Expand Up @@ -5137,7 +5138,9 @@ SUBROUTINE SURFCE
DO J=JSTA,JEND
DO I=ISTA,IEND
!-- TOTPRCP is total 1-hour accumulated precipitation in [m]
totprcp = (AVGPREC_CONT(I,J)*FLOAT(IFHR)*3600./DTQ2)
!-- RAP/HRRR and RRFS use 1-h bucket. GFS uses 3-h bucket
!-- so this section will need to be revised for GFS
totprcp = (AVGPREC(I,J)*3600.*1000./DTQ2)
snowratio = 0.0
if(graup_bucket(i,j)*1.e-3 > totprcp.and.graup_bucket(i,j)/=spval)then
print *,'WARNING - Graupel is higher that total precip at point',i,j
Expand Down