From 1a4e5a019de8706c3fc2eeee99f2af2e6875d435 Mon Sep 17 00:00:00 2001
From: Guoqing Ge <guoqing.ge@noaa.gov>
Date: Mon, 28 Aug 2023 11:31:04 -0600
Subject: [PATCH] update RTMA config files for v0.6.5 and v0.6.6 (#559)

---
 ush/config.sh.RTMA_CONUS_3km | 12 +++++++-----
 ush/config.sh.RTMA_NA_3km    |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ush/config.sh.RTMA_CONUS_3km b/ush/config.sh.RTMA_CONUS_3km
index 8af2c32d0..51f0b89b3 100644
--- a/ush/config.sh.RTMA_CONUS_3km
+++ b/ush/config.sh.RTMA_CONUS_3km
@@ -1,7 +1,7 @@
 #!/bin/bash
 source fix_rrfs_locations.sh #determine current platform
 MACHINE=${PLATFORM}
-version="v0.5.0"
+version="v0.6.6"
 ACCOUNT="nrtrr"
 RESERVATION="rrfsens"
 EXPT_BASEDIR="/home/role.rtrr/RTMA/rtma.${version}"
@@ -35,6 +35,8 @@ if [[ -n $RESERVATION ]] ; then
   LAYOUT_X=15
   LAYOUT_Y=40
   NCORES_RUN_ANAL=200
+  PPN_RUN_NONVARCLDANL="10"
+  NNODES_RUN_NONVARCLDANL="12"
 fi
 
 OBSPATH_NSSLMOSIAC=/public/data/radar/nssl/mrms/conus
@@ -133,8 +135,8 @@ SFCOBS_USELIST="/lfs4/BMC/amb-verif/rap_ops_mesonet_uselists"
 
 LBC_SPEC_INTVL_HRS="1"
 
-DATE_FIRST_CYCL="20230426"
-DATE_LAST_CYCL="20230831"
+DATE_FIRST_CYCL="20230826"
+DATE_LAST_CYCL="20231231"
 CYCL_HRS=( "00" "12" )
 CYCL_HRS_SPINSTART=("03" "15")
 CYCL_HRS_PRODSTART=("99") # RTMA always warm-starts
@@ -181,7 +183,6 @@ CYCL_HRS_HYB_FV3LAM_ENS=("19" "20" "21" "22" "23" "00")
 DT_ATMOS=1
 NCORES_RUN_ANAL=240
 IO_LAYOUT_Y=1
-PPN_RUN_NONVARCLDANL=${IO_LAYOUT_Y}
 regional_ensemble_option=1
 
 MAXTRIES_RUN_PREPSTART="3"
@@ -218,7 +219,8 @@ PREDEF_GRID_NAME=RRFS_CONUS_3km
 ADDNL_OUTPUT_GRIDS=()
 TILE_LABELS="CONUS REGIONS"
 TILE_SETS="full NE,NC,NW,SE,SC,SW"
-CCPP_PHYS_SUITE="FV3_HRRR"
+CCPP_PHYS_SUITE="FV3_HRRR_gf"
+PPN_RUN_POSTANAL="5"
 
 NET="RTMA_CONUS" ##must start with "RTMA". ${NET}.t${cyc}z.bgdawpf${fhr}.${tmmark}.grib2
 TAG="RTMA_CONUS" ## used by job names
diff --git a/ush/config.sh.RTMA_NA_3km b/ush/config.sh.RTMA_NA_3km
index 992f35df0..cda20e2c0 100644
--- a/ush/config.sh.RTMA_NA_3km
+++ b/ush/config.sh.RTMA_NA_3km
@@ -213,7 +213,7 @@ PREDEF_GRID_NAME=RRFS_NA_3km
 ADDNL_OUTPUT_GRIDS=("hrrr" "rrfsak" )
 TILE_LABELS="NA"
 TILE_SETS="full"
-CCPP_PHYS_SUITE="FV3_HRRR"
+CCPP_PHYS_SUITE="FV3_HRRR_gf"
 
 NET="RTMA_NA" ##must start with "RTMA". ${NET}.t${cyc}z.bgdawpf${fhr}.${tmmark}.grib2
 TAG="RTMA_NA" ## used by job names