Skip to content

Commit

Permalink
Make setting of GRID_GEN_METHOD part of definition of each predefined…
Browse files Browse the repository at this point in the history
… grid. (NOAA-GSL#350)

## DESCRIPTION OF CHANGES: 
* In set_predef_grid_params.sh, make setting of GRID_GEN_METHOD part of defintion of each predefined grid.
* In setup.sh, move the check on validity of value of GRID_GEN_METHOD to before the first time GRID_GEN_METHOD is used.
* Remove setting of GRID_GEN_METHOD from all WE2E files that use a predefined grid.
* Remove setting of GRID_GEN_METHOD from sample configuration files, both of which use predefined grids.
* Update comments.

## TESTS CONDUCTED: 
On hera, successfully ran the following 3 WE2E tests (these use the 3 grids supported by the release):
* grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
* grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
* grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2

Also, manually ran a test with the sample configuration file config.community.sh, which was successful.
  • Loading branch information
gsketefian authored Nov 5, 2020
1 parent 2a599e3 commit f371ada
Show file tree
Hide file tree
Showing 51 changed files with 637 additions and 829 deletions.
1 change: 0 additions & 1 deletion tests/baseline_configs/config.DOT_OR_USCORE.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ RUN_ENVIR="community"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="RRFS_CONUS_25km"
GRID_GEN_METHOD="ESGgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_GFS_2017_gfdlmp"
Expand Down
1 change: 0 additions & 1 deletion tests/baseline_configs/config.GST_release_public_v1.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ RUN_ENVIR="community"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="RRFS_CONUS_25km"
GRID_GEN_METHOD="ESGgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_GFS_v15p2"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ RUN_ENVIR="community"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="RRFS_CONUS_25km"
GRID_GEN_METHOD="ESGgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_GFS_2017_gfdlmp"
Expand Down
1 change: 0 additions & 1 deletion tests/baseline_configs/config.community_ensemble_2mems.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ RUN_ENVIR="community"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="RRFS_CONUS_25km"
GRID_GEN_METHOD="ESGgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_GFS_2017_gfdlmp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ RUN_ENVIR="community"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="RRFS_CONUS_25km"
GRID_GEN_METHOD="ESGgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_GFS_2017_gfdlmp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ RUN_ENVIR="community"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="RRFS_CONUS_25km"
GRID_GEN_METHOD="ESGgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_GFS_2017_gfdlmp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ RUN_ENVIR="community"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="RRFS_CONUS_25km"
GRID_GEN_METHOD="ESGgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_GSD_SAR"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ RUN_ENVIR="community"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="RRFS_CONUS_25km"
GRID_GEN_METHOD="ESGgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_GSD_SAR"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ RUN_ENVIR="community"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="CONUS_25km_GFDLgrid"
GRID_GEN_METHOD="GFDLgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_GFS_v16beta"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ RUN_ENVIR="community"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="CONUS_3km_GFDLgrid"
GRID_GEN_METHOD="GFDLgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_GFS_v16beta"
Expand Down
1 change: 0 additions & 1 deletion tests/baseline_configs/config.grid_GSD_HRRR_AK_50km.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ RUN_ENVIR="community"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="GSD_HRRR_AK_50km"
GRID_GEN_METHOD="ESGgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_GSD_SAR"
Expand Down
1 change: 0 additions & 1 deletion tests/baseline_configs/config.grid_GSD_RAP13km.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ RUN_ENVIR="community"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="GSD_RAP13km"
GRID_GEN_METHOD="ESGgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_GSD_v0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ RUN_ENVIR="community"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="RRFS_AK_13km"
GRID_GEN_METHOD="ESGgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_GFS_v16beta"
Expand Down
1 change: 0 additions & 1 deletion tests/baseline_configs/config.grid_RRFS_AK_13km_RAP_RAP.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ RUN_ENVIR="community"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="RRFS_AK_13km"
GRID_GEN_METHOD="ESGgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_GSD_SAR"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ RUN_ENVIR="community"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="RRFS_AK_3km"
GRID_GEN_METHOD="ESGgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_GFS_v16beta"
Expand Down
1 change: 0 additions & 1 deletion tests/baseline_configs/config.grid_RRFS_AK_3km_RAP_RAP.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ RUN_ENVIR="community"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="RRFS_AK_3km"
GRID_GEN_METHOD="ESGgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_GSD_SAR"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ RUN_ENVIR="community"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="RRFS_CONUS_13km"
GRID_GEN_METHOD="ESGgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_GFS_v15p2"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ RUN_ENVIR="community"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="RRFS_CONUS_13km"
GRID_GEN_METHOD="ESGgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_GFS_v16beta"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ RUN_ENVIR="community"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="RRFS_CONUS_13km"
GRID_GEN_METHOD="ESGgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_GSD_SAR"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ RUN_ENVIR="community"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="RRFS_CONUS_13km"
GRID_GEN_METHOD="ESGgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_RRFS_v1beta"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ RUN_ENVIR="community"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="RRFS_CONUS_25km"
GRID_GEN_METHOD="ESGgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_GFS_v15p2"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ RUN_ENVIR="community"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="RRFS_CONUS_25km"
GRID_GEN_METHOD="ESGgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_GFS_v16beta"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ RUN_ENVIR="community"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="RRFS_CONUS_25km"
GRID_GEN_METHOD="ESGgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_GSD_SAR"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ RUN_ENVIR="community"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="RRFS_CONUS_25km"
GRID_GEN_METHOD="ESGgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_RRFS_v1beta"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ RUN_ENVIR="community"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="RRFS_CONUS_3km"
GRID_GEN_METHOD="ESGgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_GFS_v15p2"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ RUN_ENVIR="community"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="RRFS_CONUS_3km"
GRID_GEN_METHOD="ESGgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_GFS_v16beta"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ RUN_ENVIR="community"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="RRFS_CONUS_3km"
GRID_GEN_METHOD="ESGgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_GSD_SAR"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ RUN_ENVIR="community"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="RRFS_CONUS_3km"
GRID_GEN_METHOD="ESGgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_RRFS_v1beta"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ RUN_ENVIR="community"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="RRFS_SUBCONUS_3km"
GRID_GEN_METHOD="ESGgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_GFS_v16beta"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ RUN_ENVIR="community"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="RRFS_SUBCONUS_3km"
GRID_GEN_METHOD="ESGgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_GSD_SAR"
Expand Down
1 change: 0 additions & 1 deletion tests/baseline_configs/config.nco_CONUS_25km_GFDLgrid.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ RUN_ENVIR="nco"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="CONUS_25km_GFDLgrid"
GRID_GEN_METHOD="GFDLgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_GFS_v16beta"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ RUN_ENVIR="nco"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="RRFS_CONUS_25km"
GRID_GEN_METHOD="ESGgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_GSD_SAR"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ RUN_ENVIR="nco"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="RRFS_CONUS_3km"
GRID_GEN_METHOD="ESGgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_GFS_2017_gfdlmp_regional"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ RUN_ENVIR="nco"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="RRFS_CONUS_3km"
GRID_GEN_METHOD="ESGgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_GSD_SAR"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ RUN_ENVIR="nco"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="RRFS_SUBCONUS_3km"
GRID_GEN_METHOD="ESGgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_GSD_SAR"
Expand Down
1 change: 0 additions & 1 deletion tests/baseline_configs/config.nco_ensemble.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ RUN_ENVIR="nco"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="CONUS_25km_GFDLgrid"
GRID_GEN_METHOD="GFDLgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_GFS_2017_gfdlmp_regional"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ RUN_ENVIR="community"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="RRFS_CONUS_25km"
GRID_GEN_METHOD="ESGgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_GFS_2017_gfdlmp"
Expand Down
1 change: 0 additions & 1 deletion tests/baseline_configs/config.regional_001.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ RUN_ENVIR="community"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="RRFS_CONUS_25km"
GRID_GEN_METHOD="ESGgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_GFS_2017_gfdlmp"
Expand Down
1 change: 0 additions & 1 deletion tests/baseline_configs/config.regional_002.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ RUN_ENVIR="community"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="RRFS_CONUS_25km"
GRID_GEN_METHOD="ESGgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_GFS_2017_gfdlmp"
Expand Down
1 change: 0 additions & 1 deletion tests/baseline_configs/config.suite_FV3_CPT_v0.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ RUN_ENVIR="community"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="RRFS_CONUS_25km"
GRID_GEN_METHOD="ESGgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_CPT_v0"
Expand Down
1 change: 0 additions & 1 deletion tests/baseline_configs/config.suite_FV3_GFS_v15p2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ RUN_ENVIR="community"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="RRFS_CONUS_25km"
GRID_GEN_METHOD="ESGgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_GFS_v15p2"
Expand Down
1 change: 0 additions & 1 deletion tests/baseline_configs/config.suite_FV3_GFS_v16beta.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ RUN_ENVIR="community"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="RRFS_CONUS_25km"
GRID_GEN_METHOD="ESGgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_GFS_v16beta"
Expand Down
1 change: 0 additions & 1 deletion tests/baseline_configs/config.suite_FV3_GSD_SAR.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ RUN_ENVIR="community"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="RRFS_CONUS_25km"
GRID_GEN_METHOD="ESGgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_GSD_SAR"
Expand Down
1 change: 0 additions & 1 deletion tests/baseline_configs/config.suite_FV3_GSD_v0.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ RUN_ENVIR="community"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="RRFS_CONUS_25km"
GRID_GEN_METHOD="ESGgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_GSD_v0"
Expand Down
1 change: 0 additions & 1 deletion tests/baseline_configs/config.suite_FV3_RRFS_v1beta.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ RUN_ENVIR="community"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="RRFS_CONUS_25km"
GRID_GEN_METHOD="ESGgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_RRFS_v1beta"
Expand Down
1 change: 0 additions & 1 deletion tests/baseline_configs/config.user_download_extrn_files.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ RUN_ENVIR="community"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="RRFS_CONUS_25km"
GRID_GEN_METHOD="ESGgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_GFS_2017_gfdlmp"
Expand Down
1 change: 0 additions & 1 deletion ush/config.community.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ RUN_ENVIR="community"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="RRFS_CONUS_25km"
GRID_GEN_METHOD="ESGgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_GFS_v15p2"
Expand Down
1 change: 0 additions & 1 deletion ush/config.nco.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ RUN_ENVIR="nco"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="CONUS_25km_GFDLgrid"
GRID_GEN_METHOD="GFDLgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_GFS_v15p2"
Expand Down
Loading

0 comments on commit f371ada

Please sign in to comment.