Skip to content

Update FV3 namelist settings; clean up diag_tables; fix QUILTING="FALSE" bug #423

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.

Sign up for GitHub

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

Merged
gsketefian merged 17 commits into from
Feb 10, 2021
Merged

Update FV3 namelist settings; clean up diag_tables; fix QUILTING="FALSE" bug #423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
66dacda
Remove the variables stretch_fac, target_lon, and target_lat from any…
gsketefian Feb 3, 2021
5b65083
Add two new generic suite WE2E tests for the FV3_2017_gfdlmp_regional…
gsketefian Feb 4, 2021
a9b95ad
Bug fix in FV3.input.yml for the GSD_v0 scheme; other minor changes.
gsketefian Feb 4, 2021
70218a6
Remove WE2E test for non-existent (for the release branch) suite FV3_…
gsketefian Feb 5, 2021
0f47fc0
Set effr_in to True in input.nml.FV3.
gsketefian Feb 5, 2021
cb3c852
Bug fix in launch_FV3LAM_wflow.sh to get the SED variable to be recog…
gsketefian Feb 6, 2021
8dc083e
Remove variable diss_est from diag_tables because there is (as of now…
gsketefian Feb 8, 2021
6aaf27d
In the diag table for the GFS_v15p2 suite, change the names of the ge…
gsketefian Feb 9, 2021
8993c88
In the diag table for the CPT_v0 and GFS_v16beta suites, change the n…
gsketefian Feb 9, 2021
9a2a107
Comment out several fields from the diag_table for the RRFS_v1alpha s…
gsketefian Feb 9, 2021
a87c1cc
Make the names of the flag files that indicate the preprocessing task…
gsketefian Feb 9, 2021
caa2d87
* Edit documentation for QUILTING in config_defaults.sh.
gsketefian Feb 9, 2021
ad07f5d
Changes to diag_table files for the GFS_v15p2 and RRFS_v1alpha suites:
gsketefian Feb 9, 2021
a6651e2
Minor edits.
gsketefian Feb 10, 2021
522f0ae
Change "days" and "years" units in diag_tables to "hours"; make spaci…
gsketefian Feb 10, 2021
517709f
Add a WE2E test for QUILTING set to "FALSE".
gsketefian Feb 10, 2021
d8cec85
Clean up WE2E test configuration files relevant to the release branch.
gsketefian Feb 10, 2021
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
4 changes: 2 additions & 2 deletions jobs/JREGIONAL_MAKE_GRID
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ Call to ex-script corresponding to J-job \"${scrfunc_fn}\" failed."
#
#-----------------------------------------------------------------------
#
# Create a flag file to make rocoto aware that the make_grid task has
# Create a flag file to make rocoto aware that the MAKE_GRID_TN task has
# successfully completed (so that other tasks that depend on it can be
# launched).
#
Expand All @@ -176,7 +176,7 @@ Call to ex-script corresponding to J-job \"${scrfunc_fn}\" failed."
#
#-----------------------------------------------------------------------
#
touch "$LOGDIR/make_grid_task_complete.txt"
touch "$LOGDIR/${MAKE_GRID_TN}_task_complete.txt"
#
#-----------------------------------------------------------------------
#
Expand Down
4 changes: 2 additions & 2 deletions jobs/JREGIONAL_MAKE_OROG
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ Call to ex-script corresponding to J-job \"${scrfunc_fn}\" failed."
#
#-----------------------------------------------------------------------
#
# Create a flag file to make rocoto aware that the make_orog task has
# Create a flag file to make rocoto aware that the MAKE_OROG_TN task has
# successfully completed (so that other tasks that depend on it can be
# launched).
#
Expand All @@ -78,7 +78,7 @@ Call to ex-script corresponding to J-job \"${scrfunc_fn}\" failed."
#
#-----------------------------------------------------------------------
#
touch "$LOGDIR/make_orog_task_complete.txt"
touch "$LOGDIR/${MAKE_OROG_TN}_task_complete.txt"
#
#-----------------------------------------------------------------------
#
Expand Down
4 changes: 2 additions & 2 deletions jobs/JREGIONAL_MAKE_SFC_CLIMO
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ Call to ex-script corresponding to J-job \"${scrfunc_fn}\" failed."
#
#-----------------------------------------------------------------------
#
# Create a flag file to make rocoto aware that the make_sfc_climo task
# Create a flag file to make rocoto aware that the MAKE_SFC_CLIMO_TN task
# has successfully completed (so that other tasks that depend on it can
# be launched).
#
Expand All @@ -100,7 +100,7 @@ Call to ex-script corresponding to J-job \"${scrfunc_fn}\" failed."
#
#-----------------------------------------------------------------------
#
touch "$LOGDIR/make_sfc_climo_task_complete.txt"
touch "$LOGDIR/${MAKE_SFC_CLIMO_TN}_task_complete.txt"
#
#-----------------------------------------------------------------------
#
Expand Down
2 changes: 1 addition & 1 deletion tests/baseline_configs/config.grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ PREDEF_GRID_NAME="RRFS_CONUS_13km"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_GFS_v15p2"
FCST_LEN_HRS="06"
FCST_LEN_HRS="6"
LBC_SPEC_INTVL_HRS="3"

DATE_FIRST_CYCL="20190701"
Expand Down
2 changes: 1 addition & 1 deletion tests/baseline_configs/config.grid_RRFS_CONUS_13km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ PREDEF_GRID_NAME="RRFS_CONUS_13km"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_RRFS_v1alpha"
FCST_LEN_HRS="06"
FCST_LEN_HRS="6"
LBC_SPEC_INTVL_HRS="3"

DATE_FIRST_CYCL="20200801"
Expand Down
4 changes: 3 additions & 1 deletion tests/baseline_configs/config.grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ PREDEF_GRID_NAME="RRFS_CONUS_25km"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_GFS_v15p2"
FCST_LEN_HRS="06"
FCST_LEN_HRS="6"
LBC_SPEC_INTVL_HRS="3"
#FCST_LEN_HRS="36"
#LBC_SPEC_INTVL_HRS="3"

DATE_FIRST_CYCL="20190701"
DATE_LAST_CYCL="20190701"
Expand Down
17 changes: 17 additions & 0 deletions ...configs/config.grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2_quilt_FALSE.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
RUN_ENVIR="community"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="RRFS_CONUS_25km"
QUILTING="FALSE"

CCPP_PHYS_SUITE="FV3_GFS_v15p2"
FCST_LEN_HRS="6"
LBC_SPEC_INTVL_HRS="3"

DATE_FIRST_CYCL="20190701"
DATE_LAST_CYCL="20190701"
CYCL_HRS=( "00" )

EXTRN_MDL_NAME_ICS="FV3GFS"
EXTRN_MDL_NAME_LBCS="FV3GFS"
USE_USER_STAGED_EXTRN_FILES="TRUE"
4 changes: 3 additions & 1 deletion tests/baseline_configs/config.grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ PREDEF_GRID_NAME="RRFS_CONUS_25km"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_RRFS_v1alpha"
FCST_LEN_HRS="06"
FCST_LEN_HRS="6"
LBC_SPEC_INTVL_HRS="3"
#FCST_LEN_HRS="36"
#LBC_SPEC_INTVL_HRS="1"

DATE_FIRST_CYCL="20200801"
DATE_LAST_CYCL="20200801"
Expand Down
2 changes: 1 addition & 1 deletion tests/baseline_configs/config.grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ PREDEF_GRID_NAME="RRFS_CONUS_3km"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_GFS_v15p2"
FCST_LEN_HRS="06"
FCST_LEN_HRS="6"
LBC_SPEC_INTVL_HRS="3"

DATE_FIRST_CYCL="20190701"
Expand Down
2 changes: 1 addition & 1 deletion tests/baseline_configs/config.grid_RRFS_CONUS_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ PREDEF_GRID_NAME="RRFS_CONUS_3km"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_RRFS_v1alpha"
FCST_LEN_HRS="06"
FCST_LEN_HRS="6"
LBC_SPEC_INTVL_HRS="3"

DATE_FIRST_CYCL="20200801"
Expand Down
0 ...s/baseline_configs/config.regional_001.sh → ...nfigs/config.suite_FV3_GFS_2017_gfdlmp.sh
View file
Open in desktop
File renamed without changes.
17 changes: 17 additions & 0 deletions tests/baseline_configs/config.suite_FV3_GFS_2017_gfdlmp_regional.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
RUN_ENVIR="community"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="RRFS_CONUS_25km"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_GFS_2017_gfdlmp_regional"
FCST_LEN_HRS="6"
LBC_SPEC_INTVL_HRS="6"

DATE_FIRST_CYCL="20190701"
DATE_LAST_CYCL="20190701"
CYCL_HRS=( "00" )

EXTRN_MDL_NAME_ICS="FV3GFS"
EXTRN_MDL_NAME_LBCS="FV3GFS"
USE_USER_STAGED_EXTRN_FILES="TRUE"
3 changes: 1 addition & 2 deletions tests/baseline_configs/config.suite_FV3_RRFS_v1alpha.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ PREDEF_GRID_NAME="RRFS_CONUS_25km"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_RRFS_v1alpha"

FCST_LEN_HRS="06"
FCST_LEN_HRS="6"
LBC_SPEC_INTVL_HRS="6"

DATE_FIRST_CYCL="20190520"
Expand Down
3 changes: 1 addition & 2 deletions tests/baseline_configs/config.suite_FV3_RRFS_v1beta.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ PREDEF_GRID_NAME="RRFS_CONUS_25km"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_RRFS_v1beta"

FCST_LEN_HRS="06"
FCST_LEN_HRS="6"
LBC_SPEC_INTVL_HRS="6"

DATE_FIRST_CYCL="20190520"
Expand Down
4 changes: 3 additions & 1 deletion tests/baselines_list.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ grid_RRFS_CONUS_13km_ics_HRRR_lbcs_RAP_suite_GSD_SAR
grid_RRFS_CONUS_13km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha
grid_RRFS_CONUS_13km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta
grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2_quilt_FALSE
grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta
grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_GSD_SAR
grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha
Expand All @@ -43,9 +44,10 @@ new_GFDLgrid
new_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_FALSE
new_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_TRUE
pregen_grid_orog_sfc_climo
regional_001
regional_002
suite_FV3_CPT_v0
suite_FV3_GFS_2017_gfdlmp
suite_FV3_GFS_2017_gfdlmp_regional
suite_FV3_GFS_v15p2
suite_FV3_GFS_v16beta
suite_FV3_GSD_SAR
Expand Down
20 changes: 12 additions & 8 deletions ush/config_defaults.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -889,14 +889,11 @@ BLOCKSIZE=""
#
# QUILTING:
# Flag that determines whether or not to use the write component for
# writing output files to disk.
#
# WRTCMP_write_groups:
# The number of write groups (i.e. groups of MPI tasks) to use in the
# write component.
#
# WRTCMP_write_tasks_per_group:
# The number of MPI tasks to allocate for each write group.
# writing forecast output files to disk. Note that if this is set to
# "FALSE", the RUN_POST_TN (meta)task cannot be run because the Unified
# Post Processor (UPP) code that this task calls cannot process the
# native grid. In that case, the RUN_POST_TN (meta)task will be
# automatically removed from the rocoto workflow XML.
#
# PRINT_ESMF:
# Flag for whether or not to output extra (debugging) information from
Expand All @@ -906,6 +903,13 @@ BLOCKSIZE=""
# in the model configuration file MODEL_CONFIG_FN in the forecast's run
# directory).
#
# WRTCMP_write_groups:
# The number of write groups (i.e. groups of MPI tasks) to use in the
# write component.
#
# WRTCMP_write_tasks_per_group:
# The number of MPI tasks to allocate for each write group.
#
#-----------------------------------------------------------------------
#
QUILTING="TRUE"
Expand Down
Loading