Skip to content
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.

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

[main] folds in retro and bug fixes made in dev-sci (#551, #558, #561) #567

Merged
merged 7 commits into from
Dec 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions modulefiles/tasks/wcoss2/enkfupdt.local.lua
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ load(pathJoin("cray-pals", os.getenv("cray_pals_ver")))
prepend_path("MODULEPATH", os.getenv("modulepath_compiler"))
prepend_path("MODULEPATH", os.getenv("modulepath_mpi"))

load(pathJoin("jasper", os.getenv("jasper_ver")))
load(pathJoin("zlib", os.getenv("zlib_ver")))
load(pathJoin("libpng", os.getenv("libpng_ver")))
load(pathJoin("hdf5", os.getenv("hdf5_ver")))
load(pathJoin("netcdf", os.getenv("netcdf_ver")))

load(pathJoin("bacio", os.getenv("bacio_ver")))
load(pathJoin("w3emc", os.getenv("w3emc_ver")))
load(pathJoin("sp", os.getenv("sp_ver")))
load(pathJoin("ip", os.getenv("ip_ver")))
load(pathJoin("nemsio", os.getenv("nemsio_ver")))

load(pathJoin("udunits", os.getenv("udunits_ver")))
load(pathJoin("gsl", os.getenv("gsl_ver")))
load(pathJoin("nco", os.getenv("nco_ver")))

load(pathJoin("sp", os.getenv("sp_ver")))
load(pathJoin("w3emc", os.getenv("w3emc_ver")))
load(pathJoin("w3nco", os.getenv("w3emc_ver")))
1 change: 1 addition & 0 deletions parm/FV3.input.yml
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,7 @@ RRFS_sas:
isncovr_opt: 3
progsigma: true
sfclay_compute_flux: true
sigmab_coldstart : true
thsfc_loc: false
# Smoke/dust options
rrfs_sd : false
Expand Down
3 changes: 3 additions & 0 deletions parm/FV3.input.yml_ensphy
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ rrfsens_phy1:
plumerisefire_frq :
dust_alpha :
dust_gamma :
sigmab_coldstart :
nam_sppperts:
iseed_spp: [4, 5, 6, 7]
spp_lscale: [150000.0, 150000.0, 150000.0, 150000.0]
Expand Down Expand Up @@ -112,6 +113,7 @@ rrfsens_phy3:
plumerisefire_frq :
dust_alpha :
dust_gamma :
sigmab_coldstart :
nam_sppperts:
spp_prt_list: [0.2, 0.2, 0.2, 0.2, 0.3]
spp_stddev_cutoff: [1.5, 1.5, 1.5, 1.5, 3.0]
Expand Down Expand Up @@ -165,6 +167,7 @@ rrfsens_phy4:
plumerisefire_frq :
dust_alpha :
dust_gamma :
sigmab_coldstart :
nam_sppperts:
iseed_spp: [4, 5, 6]
spp_lscale: [150000.0, 150000.0, 150000.0]
Expand Down
6 changes: 3 additions & 3 deletions parm/input.nml.FV3
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
fill = .true.
full_zs_filter = .false.
fv_debug = .false.
fv_sg_adj = 7200
fv_sg_adj = 300
gfs_phil = .false.
hord_dp = 6
hord_mt = 6
Expand All @@ -98,7 +98,7 @@
make_nh = .true.
mountain = .false.
n_split = 5
n_sponge = 65
n_sponge = -1
n_zs_filter = 0
na_init = 1
ncep_ic = .false.
Expand All @@ -119,7 +119,7 @@
res_latlon_dynamics = 'fv3_increment.nc'
reset_eta = .false.
rf_cutoff = 20.e2
sg_cutoff = -1
sg_cutoff = 40000.0
tau = 5.0
use_hydro_pressure = .false.
vtdm4 = 0.075
Expand Down
6 changes: 3 additions & 3 deletions parm/input.nml.RRFSFW
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
fill = .true.
full_zs_filter = .false.
fv_debug = .false.
fv_sg_adj = 7200
fv_sg_adj = 300
gfs_phil = .false.
hord_dp = 6
hord_mt = 6
Expand All @@ -100,7 +100,7 @@
make_nh = .true.
mountain = .false.
n_split = 5
n_sponge = 65
n_sponge = -1
n_zs_filter = 0
na_init = 1
ncep_ic = .false.
Expand All @@ -123,7 +123,7 @@
res_latlon_dynamics = 'fv3_increment.nc'
reset_eta = .false.
rf_cutoff = 2000.0
sg_cutoff = -1
sg_cutoff = 40000.0
tau = 5.0
use_hydro_pressure = .false.
vtdm4 = 0.02
Expand Down
8 changes: 6 additions & 2 deletions scripts/exrrfs_analysis_gsi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -748,7 +748,8 @@ fi

# Get aircraft reject list
for reject_list in "${AIRCRAFT_REJECT}/current_bad_aircraft.txt" \
"${AIRCRAFT_REJECT}/${AIR_REJECT_FN}"
"${AIRCRAFT_REJECT}/${AIR_REJECT_FN}" \
"${FIX_GSI}/current_bad_aircraft.txt"
do
if [ -r $reject_list ]; then
cpreq -p $reject_list current_bad_aircraft
Expand All @@ -764,7 +765,8 @@ fi
gsd_sfcobs_uselist="gsd_sfcobs_uselist.txt"
for use_list in "${SFCOBS_USELIST}/current_mesonet_uselist.txt" \
"${SFCOBS_USELIST}/${MESO_USELIST_FN}" \
"${SFCOBS_USELIST}/gsd_sfcobs_uselist.txt"
"${SFCOBS_USELIST}/gsd_sfcobs_uselist.txt" \
"${FIX_GSI}/gsd_sfcobs_uselist.txt"
do
if [ -r $use_list ] ; then
cpreq -p $use_list $gsd_sfcobs_uselist
Expand Down Expand Up @@ -1009,6 +1011,7 @@ else
cat fit_p1 fit_w1 fit_t1 fit_q1 fit_pw1 fit_rad1 fit_rw1 > $COMOUT/rrfs.t${HH}z.fits.tm00
cat fort.208 fort.210 fort.211 fort.212 fort.213 fort.220 > $COMOUT/rrfs.t${HH}z.fits2.tm00
cat fort.238 > $COMOUT/rrfs.t${HH}z.fits3.tm00
cp -L dbzobs.nc $COMOUT/rrfs.mrms.${YYYYMMDDHH}.nc
fi
#
#-----------------------------------------------------------------------
Expand Down Expand Up @@ -1153,6 +1156,7 @@ if [ "${DO_GSIDIAG_OFFLINE}" = "FALSE" ]; then
cp ./satbias_pc.out ${SATBIAS_DIR}/rrfs.${spinup_or_prod_rrfs}.${YYYYMMDDHH}_satbias_pc
cp ./satbias_out ${COMOUT}/rrfs.${spinup_or_prod_rrfs}.${YYYYMMDDHH}_satbias
cp ./satbias_pc.out ${COMOUT}/rrfs.${spinup_or_prod_rrfs}.${YYYYMMDDHH}_satbias_pc
cp -L dbzobs.nc $COMOUT/rrfs.mrms.${YYYYMMDDHH}.nc
fi
fi
fi # run diag inline (with GSI)
Expand Down
18 changes: 9 additions & 9 deletions sorc/app_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ OPTIONS
build without GTG (default is true, this option turns it off)
--noifi
build without IFI (default is true, this option turns it off)
--paralstart
build module with enabled parallel start (default is off)
--noparalstart
do not build module with enabled parallel start (default is on)
--extrn
check out external components
--continue
Expand Down Expand Up @@ -128,7 +128,7 @@ BUILD_JOBS=4
EXTRN=false
NOGTG=false
NOIFI=false
PARALSTART=false
PARALSTART=true
REMOVE=false
CONTINUE=false
VERBOSE=false
Expand Down Expand Up @@ -175,7 +175,7 @@ while :; do
--extrn=?*|--extrn=) usage_error "$1 argument ignored." ;;
--nogtg) NOGTG=true ;;
--noifi) NOIFI=true ;;
--paralstart) PARALSTART=true ;;
--noparalstart) PARALSTART=false ;;
--remove) REMOVE=true ;;
--remove=?*|--remove=) usage_error "$1 argument ignored." ;;
--continue) CONTINUE=true ;;
Expand Down Expand Up @@ -257,11 +257,11 @@ fi
if [ "${NOIFI}" = true ]; then
BUILD_IFI="off"
fi
ENABLE_PARALLELRESTART="off"
ENABLE_RRFS_WAR="on"
if [ "${PARALSTART}" = true ]; then
ENABLE_PARALLELRESTART="on"
ENABLE_RRFS_WAR="off"
ENABLE_PARALLELRESTART="on"
ENABLE_RRFS_WAR="off"
if [ "${PARALSTART}" = false ]; then
ENABLE_PARALLELRESTART="off"
ENABLE_RRFS_WAR="on"
fi

# check out external components specified in External.cfg
Expand Down
8 changes: 4 additions & 4 deletions ush/sample_configs/RRFS_A/config.sh_rrfs_a_enkf_n3_retro
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MACHINE="wcoss2"
MACHINETYPE="backup"
version="v0.9.2"
version="v1.0.4"
ACCOUNT="RRFS_DEV"
#RESERVATION="rrfsdet"
EXPT_BASEDIR="/lfs/h2/emc/lam/noscrub/emc.lam/rrfs/${version}"
Expand Down Expand Up @@ -59,7 +59,7 @@ EXTRN_MDL_ICS_OFFSET_HRS="6"
LBC_SPEC_INTVL_HRS="1"
EXTRN_MDL_LBCS_OFFSET_HRS="6"
BOUNDARY_LEN_HRS="12"
BOUNDARY_PROC_GROUP_NUM="12"
BOUNDARY_PROC_GROUP_NUM="4"

# avaialble retro period:
# 20210511-20210531; 20210718-20210801
Expand Down Expand Up @@ -200,10 +200,10 @@ LNDPINT=180

RUN_ensctrl="rrfs"
RUN="enkfrrfs"
TAG="n3enkf92"
TAG="n3enkf104"
if [[ ${DO_ENSFCST} == "TRUE" ]] ; then
RUN="refs"
TAG="n3enfcst92"
TAG="n3enfcst104"
fi

. set_rrfs_config.sh
Expand Down
13 changes: 7 additions & 6 deletions ush/sample_configs/RRFS_A/config.sh_rrfs_a_n3_retro
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MACHINE="wcoss2"
MACHINETYPE="backup"
version="v0.9.2"
version="v1.0.4"
ACCOUNT="RRFS_DEV"
#RESERVATION="rrfsdet"
EXPT_BASEDIR="/lfs/h2/emc/lam/noscrub/emc.lam/rrfs/${version}"
Expand Down Expand Up @@ -41,8 +41,8 @@ GLMFED_DATA_MODE="FULL"
EXTRN_MDL_ICS_OFFSET_HRS="3"
LBC_SPEC_INTVL_HRS="1"
EXTRN_MDL_LBCS_OFFSET_HRS="6"
BOUNDARY_LEN_HRS="72"
BOUNDARY_PROC_GROUP_NUM="72"
BOUNDARY_LEN_HRS="90"
BOUNDARY_PROC_GROUP_NUM="31"

# avaialble retro period:
# 20210511-20210531; 20210718-20210801
Expand Down Expand Up @@ -78,12 +78,13 @@ FCST_LEN_HRS_SPINUP="1"
#FCST_LEN_HRS_CYCLES=(21 21 21 63 21 21 21 21 21 63 21 21 21 21 21 63 21 21 21 21 21 63 21 21)
for i in {0..23}; do FCST_LEN_HRS_CYCLES[$i]=3; done
for i in {0..23..3}; do FCST_LEN_HRS_CYCLES[$i]=12; done
for i in {0..23..6}; do FCST_LEN_HRS_CYCLES[$i]=84; done
DA_CYCLE_INTERV="1"
RESTART_INTERVAL="1"
RESTART_INTERVAL_LONG="1"
## set up post
POSTPROC_LEN_HRS="18"
POSTPROC_LONG_LEN_HRS="60"
POSTPROC_LEN_HRS="3"
POSTPROC_LONG_LEN_HRS="84"

# 15 min output upto 18 hours
OUTPUT_FH="1 -1"
Expand Down Expand Up @@ -121,7 +122,7 @@ EXTRN_MDL_DATE_JULIAN="TRUE"
envir="para"

NET="rrfs_a"
TAG="n3v92"
TAG="n3v104"

MODEL="rrfs_a"
RUN="rrfs"
Expand Down
4 changes: 3 additions & 1 deletion ush/set_rrfs_config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,11 @@ if [[ $DO_RETRO == "TRUE" ]] ; then
# for winter 2022
#RETRODATAPATH="/lfs/h2/emc/lam/noscrub/emc.lam/rrfs_retro_data"
# for spring 2023
RETRODATAPATH="/lfs/h2/emc/lam/noscrub/donald.e.lippi/rrfs-stagedata"
#RETRODATAPATH="/lfs/h2/emc/lam/noscrub/donald.e.lippi/rrfs-stagedata"
#for Feb 2022
# RETRODATAPATH="/lfs/h2/emc/da/noscrub/donald.e.lippi/rrfs-stagedata"
# for Jan 2024
RETRODATAPATH="/lfs/h3/emc/rrfstemp/donald.e.lippi/rrfs-stagedata"
if [[ ${DO_ENSEMBLE} == "TRUE" ]]; then
if [[ ${EXTRN_MDL_NAME_ICS} == "GEFS" ]]; then
EXTRN_MDL_SOURCE_BASEDIR_ICS="${RETRODATAPATH}/GEFS/dsg"
Expand Down
Loading