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 old/obsolete suites (CPT_v0, GSD_v0, GSD_SAR) from workflow #697

Merged

Conversation

gsketefian
Copy link
Collaborator

@gsketefian gsketefian commented Mar 9, 2022

DOCUMENTATION:

This PR removes the FV3_CPT_v0, FV3_GSD_v0, and FV3_GSD_SAR suites from the workflow. This consists of:

  1. Removing these suites from ex-scripts, templates, and the set of valid values for the variable CCPP_PHYS_SUITE,
  2. Removing the diag_table_... and field_table_... files for these suites.
  3. Removing WE2E tests in the grids_extrn_mdls_suites_community category (which are tests to make sure that specific combinations of grids, external models, and suites work well together) that use these suites.
  4. Modifying the three WE2E tests in the wflow_features category (get_from_HPSS_ics_HRRR_lbcs_RAP, get_from_HPSS_ics_RAP_lbcs_RAP, and specify_DT_ATMOS_LAYOUT_XY_BLOCKSIZE) that happen to use the FV3_GSD_SAR suite such that they now use the FV3_HRRR suite. (There are no such tests that use the FV3_CPT_v0 and FV3_GSD_v0 suites.) Note that we don't remove these tests because their purpose is not to test the suite but to test fetching of files from HPSS (get_from_HPSS_ics_HRRR_lbcs_RAP and get_from_HPSS_ics_RAP_lbcs_RAP) and to test that the experiment variables DT_ATMOS, LAYOUT_X, LAYOUT_Y, and BLOCKSIZE can be correctly specified in the user's experiment configuration file (specify_DT_ATMOS_LAYOUT_XY_BLOCKSIZE
  5. Updating comments in scripts that may refer to one of these three suites.

This PR also makes improvements to the tests/get_expts_status.sh script that is used to check the status of a set of experiments in a specified directory.

DEPENDENCIES:

PR #224 in the ufs-srweather-app repo.

TESTS CONDUCTED:

Ran the following tests on Hera:

grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha
grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta
grid_RRFS_CONUS_25km_ics_HRRR_lbcs_HRRR_suite_HRRR
nco_grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_HRRR
get_from_HPSS_ics_HRRR_lbcs_RAP
get_from_HPSS_ics_RAP_lbcs_RAP
specify_DT_ATMOS_LAYOUT_XY_BLOCKSIZE

All succeeded. Also, since the modifications to the FV3.input.yml file affect the FV3_RRFS_v1alpha, FV3_RRFS_v1beta, and FV3_HRRR suites, the input.nml files for these suites generated using the (original) develop branch were compared to the ones generated using this branch/PR, and all were found to be identical.

ISSUE (optional):

Resolves Issue #668.

…s.sh script generates (by checking the status of the WE2E tests in a given directory).
…unity subdirectory (category) those tests that use the GSD_SAR suite.
…unity subdirectory (category) those tests that use the CPT_v0 and GSD_v0 suites.
…the FV3_GSD_SAR suite, change the suite to FV3_HRRR (since FV3_GSD_SAR is being removed).
… valid parameter values for CCPP_PHYS_SUITE and from the yaml FV3 namelist configuration file. Also, update comments in python scripts.
Copy link
Collaborator

@mkavulich mkavulich left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, I ran a suite of tests with these changes and it got rid of all the physics suite failures.

@gsketefian gsketefian merged commit 2718b62 into ufs-community:develop Mar 15, 2022
gsketefian added a commit to ufs-community/ufs-srweather-app that referenced this pull request Mar 15, 2022
…of regional_workflow (#224)

## DESCRIPTION OF CHANGES: 
This removes the old/unused physics suite `FV3_CPT_v0` from the list of suites to build.  It also updates the hash of `regional_workflow` to include PR #[697](ufs-community/regional_workflow#697).

## TESTS CONDUCTED: 
Builds successfully on Hera.  See PR #[697](ufs-community/regional_workflow#697) in the `regional_workflow` repo for WE2E tests conducted.

## DEPENDENCIES:
This must be merged after PR #[697](ufs-community/regional_workflow#697) is merged in the `regional_workflow` repo.
mkavulich added a commit that referenced this pull request Mar 21, 2022
## DESCRIPTION OF CHANGES: 
Several paths in the machine-specific files point to locations in user paths or old locations of static data. This PR updates paths of static data in regional_workflow/ush/machine/ to point to the official, centralized locations on Cheyenne, Hera, and Jet.

## TESTS CONDUCTED: 
Ran the following suite of end-to-end tests on Cheyenne and Jet prior to the latest ufs-weather-model hash update. All passed. This list of tests was chosen because all of these tests are known to succeed on all tested platforms, and this tests a variety of input and boundary condition types.

- grid_CONUS_25km_GFDLgrid_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
- 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_v16
- grid_RRFS_CONUS_25km_ics_HRRR_lbcs_HRRR_suite_HRRR
- grid_RRFS_CONUS_25km_ics_HRRR_lbcs_HRRR_suite_RRFS_v1beta
- grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_HRRR
- grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta
- grid_RRFS_CONUS_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta


On Hera, I ran tests with the latest SRW hash, which included the updated weather model. Because of this, many tests could not be generated due to using old, removed CCPP suites (see issue #668). To get around this issue, I tested with the fixes from #697 incorporated into my branch. With those extra commits, all "get_extrn_ics" and "get_extrn_lbcs" tasks completed successfully, which indicates that all data is in its correct place.

## ISSUE (optional): 
Will resolve a few issues in #673, many remain however.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants