From 14a170dfd5e6f29332f5ed486aa95ea1cf80c759 Mon Sep 17 00:00:00 2001 From: eric james Date: Thu, 15 Jun 2023 18:30:06 +0000 Subject: [PATCH 1/5] Correcting 1h precip for GSL precip type analysis. We were previously using run total precip. --- sorc/ncep_post.fd/SURFCE.f | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sorc/ncep_post.fd/SURFCE.f b/sorc/ncep_post.fd/SURFCE.f index d8bcf2415..4a3a34e1d 100644 --- a/sorc/ncep_post.fd/SURFCE.f +++ b/sorc/ncep_post.fd/SURFCE.f @@ -5137,7 +5137,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 From d180a7a6825aa97cf10415ba7078d595c7087b62 Mon Sep 17 00:00:00 2001 From: eric james Date: Thu, 15 Jun 2023 20:50:33 +0000 Subject: [PATCH 2/5] Add change log. --- sorc/ncep_post.fd/SURFCE.f | 1 + 1 file changed, 1 insertion(+) diff --git a/sorc/ncep_post.fd/SURFCE.f b/sorc/ncep_post.fd/SURFCE.f index 4a3a34e1d..95c7287a3 100644 --- a/sorc/ncep_post.fd/SURFCE.f +++ b/sorc/ncep_post.fd/SURFCE.f @@ -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 From 7a73177b4007e8e75c6d9ce88ebba2588dd24a03 Mon Sep 17 00:00:00 2001 From: eric james Date: Wed, 21 Jun 2023 15:22:33 +0000 Subject: [PATCH 3/5] Changing precip type variables in NATLEV files to GSL algorithm. --- parm/fv3lam_rrfs.xml | 8 ++++---- parm/postxconfig-NT-fv3lam_rrfs.txt | 24 ++++++++++++------------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/parm/fv3lam_rrfs.xml b/parm/fv3lam_rrfs.xml index a9cf5fb91..c7f8741ec 100755 --- a/parm/fv3lam_rrfs.xml +++ b/parm/fv3lam_rrfs.xml @@ -2416,28 +2416,28 @@ - INST_CRAIN_ON_SURFACE + GSD_INST_CRAIN_ON_SURFACE CRAIN NCEP 1.0 - CSNOW_ON_SURFACE + GSD_CSNOW_ON_SURFACE CSNOW NCEP 1.0 - CICEP_ON_SURFACE + GSD_CICEP_ON_SURFACE CICEP NCEP 1.0 - CFRZR_ON_SURFACE + GSD_CFRZR_ON_SURFACE CFRZR NCEP 1.0 diff --git a/parm/postxconfig-NT-fv3lam_rrfs.txt b/parm/postxconfig-NT-fv3lam_rrfs.txt index 31d8a0ed5..187d3ce5b 100644 --- a/parm/postxconfig-NT-fv3lam_rrfs.txt +++ b/parm/postxconfig-NT-fv3lam_rrfs.txt @@ -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 @@ -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 @@ -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 @@ -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 From b3d792d88277fbf4d478d8d241d9f96054a23690 Mon Sep 17 00:00:00 2001 From: eric james Date: Thu, 22 Jun 2023 17:54:36 +0000 Subject: [PATCH 4/5] Modifying intel.yml to try to address CI failures, based on suggestion from Alex Richert. --- .github/workflows/intel.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/intel.yml b/.github/workflows/intel.yml index f8f251806..e3bef506f 100644 --- a/.github/workflows/intel.yml +++ b/.github/workflows/intel.yml @@ -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 @@ -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 From 5f37c93f2fc02292665e69a450110e52ea02a458 Mon Sep 17 00:00:00 2001 From: eric james Date: Thu, 22 Jun 2023 18:22:12 +0000 Subject: [PATCH 5/5] Change one last actions/cache instance. --- .github/workflows/intel.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/intel.yml b/.github/workflows/intel.yml index e3bef506f..9819136de 100644 --- a/.github/workflows/intel.yml +++ b/.github/workflows/intel.yml @@ -94,7 +94,7 @@ jobs: - name: cache-env id: cache-env - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | spack