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

Remove RRFS_v1alpha suite #809

Merged
merged 3 commits into from
Jul 12, 2022
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
1 change: 0 additions & 1 deletion scripts/exregional_make_ics.sh
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@ case "${CCPP_PHYS_SUITE}" in
varmap_file="GFSphys_var_map.txt"
;;
#
"FV3_RRFS_v1alpha" | \
"FV3_RRFS_v1beta" | \
"FV3_GFS_v15_thompson_mynn_lam3km" | \
"FV3_HRRR" )
Expand Down
1 change: 0 additions & 1 deletion scripts/exregional_make_lbcs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,6 @@ case "${CCPP_PHYS_SUITE}" in
varmap_file="GFSphys_var_map.txt"
;;
#
"FV3_RRFS_v1alpha" | \
"FV3_RRFS_v1beta" | \
"FV3_GFS_v15_thompson_mynn_lam3km" | \
"FV3_HRRR" )
Expand Down
1 change: 0 additions & 1 deletion tests/WE2E/machine_suites/hera.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@ grid_RRFS_CONUS_25km_ics_GSMGFS_lbcs_GSMGFS_suite_GFS_v15p2
grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_HRRR_suite_HRRR
grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_HRRR_suite_RRFS_v1beta
grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_HRRR
grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha
grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta
nco_grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_HRRR
1 change: 0 additions & 1 deletion tests/WE2E/machine_suites/jet.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@ grid_RRFS_CONUS_25km_ics_GSMGFS_lbcs_GSMGFS_suite_GFS_v15p2
grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_HRRR_suite_HRRR
grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_HRRR_suite_RRFS_v1beta
grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_HRRR
grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha
grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta
nco_grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_HRRR

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# ------------------------
#
# This test is to ensure that the workflow running in community mode
# completes successfully on the RRFS_NA_3km grid using the RRFS_v1alpha
# completes successfully on the RRFS_NA_3km grid using the RRFS_v1beta
# physics suite with ICs and LBCs derived from the FV3GFS.
#
# Note that this test also sets various resource parameters for several
Expand All @@ -15,7 +15,7 @@ RUN_ENVIR="community"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="RRFS_NA_3km"
CCPP_PHYS_SUITE="FV3_RRFS_v1alpha"
CCPP_PHYS_SUITE="FV3_RRFS_v1beta"

EXTRN_MDL_NAME_ICS="FV3GFS"
EXTRN_MDL_NAME_LBCS="FV3GFS"
Expand Down
33 changes: 14 additions & 19 deletions ush/templates/FV3.input.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
# and provide this file and the desired section via the -c option.


FV3_RRFS_v1alpha:
gfs_physics_nml: &RRFS_v1alpha_phys
FV3_RRFS_v1beta:
gfs_physics_nml: &RRFS_v1beta_phys
do_deep: False
do_mynnsfclay: False
do_mynnsfclay: True
imfdeepcnv: -1
imfshalcnv: -1
iopt_alb: 2
Expand All @@ -34,11 +34,6 @@ FV3_RRFS_v1alpha:
lsm: 2
lsoil_lsm: 4

FV3_RRFS_v1beta:
gfs_physics_nml:
<<: *RRFS_v1alpha_phys
do_mynnsfclay: True

FV3_HRRR:
fv_core_nml:
hord_dp: -5
Expand All @@ -52,7 +47,7 @@ FV3_HRRR:
nord_tr: 2
nrows_blend: 10
gfs_physics_nml:
<<: *RRFS_v1alpha_phys
<<: *RRFS_v1beta_phys
cdmbgwd: [3.5, 1.0]
do_mynnsfclay: True
do_sfcperts: !!python/none
Expand Down Expand Up @@ -282,19 +277,19 @@ FV3_GFS_v15_thompson_mynn_lam3km:
atmos_model_nml:
avg_max_length: 3600.0
fv_core_nml:
agrid_vel_rst: true
agrid_vel_rst: True
full_zs_filter: !!python/none
n_sponge: 9
npz_type: ''
rf_fast: false
rf_fast: False
sg_cutoff: 10000.0
vtdm4: 0.02
gfs_physics_nml:
avg_max_length: 3600.0
cdmbgwd: [0.88, 0.04]
do_deep: false
do_mynnsfclay: true
do_ugwp: false
do_deep: False
do_mynnsfclay: True
do_ugwp: False
fhswr: 900.0
fhlwr: 900.0
iaer: 1011
Expand All @@ -316,11 +311,11 @@ FV3_GFS_v15_thompson_mynn_lam3km:
iopt_tbot: 2
iopt_trs: 2
iovr: 3
ldiag_ugwp: false
lgfdlmprad: false
ldiag_ugwp: False
lgfdlmprad: False
lsm: 1
lsoil_lsm: !!python/none
ltaerosol: false
ltaerosol: False
xkzminv: 0.3
xkzm_m: 1.0
xkzm_h: 1.0
Expand All @@ -330,7 +325,7 @@ FV3_GFS_v16:
launch_level: 27
fv_core_nml:
<<: *gfs_v15_fv_core
agrid_vel_rst: false
agrid_vel_rst: False
d2_bg_k1: 0.2
d2_bg_k2: 0.0
fv_sg_adj: 450
Expand All @@ -339,7 +334,7 @@ FV3_GFS_v16:
hord_tm: 5
hord_vt: 5
k_split: 6
make_nh: false
make_nh: False
n_split: 6
n_sponge: 10
na_init: 0
Expand Down
Loading