make usenewgfsberror configurable; add l_obsprvdiag and anavinfo.rtma (…

…ufs-community#369)
christinaholtNOAA · May 3, 2022 · 2a708fa · 2a708fa
1 parent 533ea56
commit 2a708fa
Show file tree

Hide file tree

Showing 5 changed files with 78 additions and 9 deletions.
diff --git a/fix/gsi/anavinfo.rtma b/fix/gsi/anavinfo.rtma
@@ -0,0 +1,60 @@
+met_guess::
+!var     level    crtm_use    desc              orig_name
+  ps        1      -1         surface_pressure     ps
+  z         1      -1         geopotential_height  phis
+  u        65       2         zonal_wind           u
+  v        65       2         meridional_wind      v
+  tv       65       2         virtual_temperature  tv
+  q        65       2         specific_humidity    sphu
+  oz       65       2         ozone                ozone
+  delp     65      -1         fv3 del pressure     delp
+  t2m       1      -1         2-m_T                t2m
+  q2m       1      -1         2-m_Q                q2m
+::
+
+state_derivatives::
+!var  level  src
+ ps   1      met_guess
+ u    65     met_guess
+ v    65     met_guess
+ tv   65     met_guess
+ q    65     met_guess
+ oz   65     met_guess
+ cw   65     met_guess
+ prse 66     met_guess
+::
+
+state_tendencies::
+!var  levels  source
+ u    65      met_guess
+ v    65      met_guess
+ tv   65      met_guess
+ q    65      met_guess
+ oz   65      met_guess
+ prse 66      met_guess
+::
+
+state_vector::  
+!var     level  itracer source     funcof
+ u        65      0     met_guess    u
+ v        65      0     met_guess    v
+ tv       65      0     met_guess    tv
+ tsen     65      0     met_guess    tv,q
+ q        65      1     met_guess    q
+ oz       65      1     met_guess    oz
+ prse     66      0     met_guess    prse
+ ps        1      0     met_guess    prse
+ sst       1      0     met_guess    sst
+::
+
+control_vector::
+!var     level  itracer as/tsfc_sdv  an_amp0   source  funcof
+ sf       65      0       1.00        -1.0     state    u,v
+ vp       65      0       1.00        -1.0     state    u,v
+ ps        1      0       0.50        -1.0     state    prse
+ t        65      0       0.70        -1.0     state    tv
+ q        65      1       0.70        -1.0     state    q
+ sst       1      0       1.00        -1.0     state    sst
+ stl       1      0       1.00        -1.0     motley   sst
+ sti       1      0       1.00        -1.0     motley   sst
+::
diff --git a/fix/gsi/gsiparm.anl.sh b/fix/gsi/gsiparm.anl.sh
@@ -16,6 +16,7 @@ gsi_namelist="
    l4densvar=.false.,nhr_obsbin=3,
    use_gfs_nemsio=.false.,use_gfs_ncio=.true.,reset_bad_radbc=.true.,
    netcdf_diag=.false.,
+   l_obsprvdiag=${l_obsprvdiag},
  /     
  &GRIDOPTS
    fv3_regional=.true.,grid_ratio_fv3_regional=${grid_ratio_fv3},nvege_type=20,
@@ -25,7 +26,7 @@ gsi_namelist="
    vs=${bkgerr_vs},
    hzscl=${bkgerr_hzscl},
    bw=0.,fstat=.true.,
-   usenewgfsberror=.true.,
+   usenewgfsberror=${usenewgfsberror},
 /
  &ANBKGERR
    anisotropic=.false.,

diff --git a/ush/config.sh.RTMA_CONUS_3km b/ush/config.sh.RTMA_CONUS_3km
@@ -44,7 +44,7 @@ VERBOSE="TRUE"
 RUN_ENVIR="nco"
 
 PREDEF_GRID_NAME=RRFS_CONUS_3km
-ADDNL_OUTPUT_GRIDS=( )
+ADDNL_OUTPUT_GRIDS=()
 
 TILE_LABELS="CONUS REGIONS"
 TILE_SETS="full NE,NC,NW,SE,SC,SW"
@@ -59,6 +59,7 @@ RADARREFL_TIMELEVEL=(0)
 #FH_DFI_RADAR="0.0,0.25,0.5"
 #DO_SOIL_ADJUST="TRUE"
 #DO_RADDA="FALSE"
+#DO_BUFRSND="FALSE"
 #
 #-------------------------------------------------------------------------------------
 #      GSI Namelist parameters configurable across differnt applications
@@ -71,11 +72,13 @@ RADARREFL_TIMELEVEL=(0)
 #-------------------------------------------------------------------------------------
 #
 # &SETUP  and &BKGERR
+l_obsprvdiag=.true.
 diag_radardbz=.false.
 write_diag_2=.true.
 bkgerr_vs=0.125                        #1.0 is default setting
 #bkgerr_hzscl=0.373,0.746,1.5         #default setting, no trailing ,
 bkgerr_hzscl=0.046625,0.09325,0.1875  #hzscl/8
+usenewgfsberror=.false.
 
 # &HYBRID_ENSEMBLE
 readin_localization=.true.     #if true, it overwrites the "beta1_inv/ens_h/ens_v" setting
@@ -95,7 +98,7 @@ i_use_2mT4B=0
 #-------------------------------------------------------------------------------------
 #
 BERROR_FN="berror.rtma"      #under $FIX_GSI
-ANAVINFO_FN="anavinfo.fv3lam_hrrr"
+ANAVINFO_FN="anavinfo.rtma"
 CONVINFO_FN="convinfo.rtma"
 OBERROR_FN="errtable.rtma"
 HYBENSINFO_FN="hybens_info.rtma"
@@ -178,6 +181,7 @@ NCORES_PER_NODE=40 #kjet
 FG_ROOTDIR="/lfs4/BMC/nrtrr/NCO_dirs/nwges/para/RRFS_CONUS" #only needed by RTMA
 DT_ATMOS=1
 #adjust to low priority queue and possible preemption, slurm socket error, etc
+MAXTRIES_RUN_PREPSTART="3"
 MAXTRIES_RUN_FCST="3"
 MAXTRIES_ANAL_GSI="3"
 MAXTRIES_RUN_POST="3"
@@ -213,7 +217,6 @@ MODEL="RTMA_CONUS" #used by NCL
 RUN="RTMA_CONUS"
 COMINgfs=""
 OBSPATH="/lfs4/BMC/wrfruc/gge/rtma/wcoss_obs"
-BERROR_FN="rrfs_glb_berror.l127y194.f77"
 
 STMP="/lfs4/BMC/nrtrr/NCO_dirs/stmp"  # Path to directory STMP that mostly contains input files.
 PTMP="/lfs4/BMC/nrtrr/NCO_dirs/ptmp"  # Path to directory STMP that mostly contains input files.
@@ -230,14 +233,15 @@ if [[ "$MACHINE" == "wcoss_dell_p3" ]]; then
   PARTITION_ANALYSIS=""
   PARTITION_GRAPHICS=""
   PARTITION_WGRIB2=""
+  DO_BUFRSND="FALSE"
 
   OBSPATH_NSSLMOSIAC="/gpfs/dell1/nco/ops/dcom/prod/ldmdata/obs/upperair/mrms/conus/MergedReflectivityQC"
   AIRCRAFT_REJECT="/gpfs/dell2/emc/modeling/noscrub/Edward.Colon/FixData/obsuselist/amdar_reject_lists"
   SFCOBS_USELIST="/gpfs/dell2/emc/modeling/noscrub/Edward.Colon/FixData/obsuselist/mesonet_uselists"
 
   WTIME_RUN_ANAL="00:30:00"
-  NNODES_RUN_ANAL="70"
-  PPN_RUN_ANAL="7"
+  NNODES_RUN_ANAL="28"
+  PPN_RUN_ANAL="14"
 
   LAYOUT_X=42
   LAYOUT_Y=40
@@ -259,6 +263,6 @@ if [[ "$MACHINE" == "wcoss_dell_p3" ]]; then
   NWGES="/gpfs/dell2/ptmp/${USER}/nwges"
 fi
 # Wait longer for rrfsdas
-if [[ "$MACHINE" == "jet" ]] && [[ $regional_ensemble_option -eq 5 ]] ; then
+#if [[ "$MACHINE" == "jet" ]] && [[ $regional_ensemble_option -eq 5 ]] ; then
 #  START_TIME_ANAL="5:00:00"
-fi
+#fi
diff --git a/ush/config.sh.RTMA_NA_3km b/ush/config.sh.RTMA_NA_3km
@@ -75,11 +75,13 @@ DO_DACYCLE="TRUE"
 #-------------------------------------------------------------------------------------
 #
 # &SETUP  and &BKGERR
+l_obsprvdiag=.true.
 diag_radardbz=.false.
 write_diag_2=.true.
 bkgerr_vs=0.125                        #1.0 is default setting
 #bkgerr_hzscl=0.373,0.746,1.5         #default setting, no trailing ,
 bkgerr_hzscl=0.046625,0.09325,0.1875  #hzscl/8
+usenewgfsberror=.false.
 
 # &HYBRID_ENSEMBLE
 readin_localization=.true.     #if true, it overwrites the "beta1_inv/ens_h/ens_v" setting
@@ -99,7 +101,7 @@ i_use_2mT4B=0
 #-------------------------------------------------------------------------------------
 #
 BERROR_FN="berror.rtma"      #under $FIX_GSI
-ANAVINFO_FN="anavinfo.fv3lam_hrrr"
+ANAVINFO_FN="anavinfo.rtma"
 CONVINFO_FN="convinfo.rtma"
 OBERROR_FN="errtable.rtma"
 HYBENSINFO_FN="hybens_info.rtma"

diff --git a/ush/config_defaults.sh b/ush/config_defaults.sh
@@ -581,10 +581,12 @@ ARCHIVE_CYCLEDEF="00 01 01 01 2100 *"
 #       (need to follow FORTRAN namelist convetion)
 #-------------------------------------------------------------------------------------
 # &SETUP  and &BKGERR
+l_obsprvdiag=.false.
 diag_radardbz=.true.
 write_diag_2=.false.
 bkgerr_vs=1.0
 bkgerr_hzscl=0.7,1.4,2.80   #no trailing ,
+usenewgfsberror=.true.
 
 # &HYBRID_ENSEMBLE
 readin_localization=.true.     #if true, it overwrites the "beta1_inv/ens_h/ens_v" setting