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

Revert "update templates for diag_table to be consistent with model_configure " #787

Closed

Conversation

junwang-noaa
Copy link
Collaborator

Reverts #781

@junwang-noaa junwang-noaa deleted the revert-781-feature/diag_template_update branch November 4, 2021 15:01
epic-cicd-jenkins pushed a commit that referenced this pull request Apr 17, 2023
## DESCRIPTION OF CHANGES: 
For clarity, rename variables related to GFDLgrid-type grids:
1) Rename `GFDLgrid_RES` to `GFDLgrid_NUM_CELLS`.
2) Rename `GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES` to `GFDLgrid_USE_NUM_CELLS_IN_FILENAMES`.
3) Rename WE2E tests on GFDLgrid-type custom grids according to variable renaming above.

Related improvements:
* In `link_fix.sh`, remove creation of unnecessary symlink when using a GFDLgrid-type grid with `GFDLgrid_USE_NUM_CELLS_IN_FILENAMES` is set to `"FALSE"`.
* In WE2E test configuration files that use custom grids, move the definition of the variable `POST_OUTPUT_DOMAIN_NAME` to the beginning of the custom grid definition because it is really the name of the custom native grid, and it's most appropriate to place that at the beginning of the grid definition section.
* Reduce `WTIME_MAKE_OROG` from 1 hour to 20 minutes since on Hera, 1 hour causes the task to wait quite a while in the queue.  This used to be 20 minutes but was changed to 1 hour because 20 minutes was not sufficient to complete the task on `WCOSS_DELL_P3`.  Thus, reset it to 1 hour only in the machine file for `WCOSS_DELL_P3`.
* Minor fixes to comments in python plotting scripts.
* Edits to other comments.

## TESTS CONDUCTED: 
Ran the four WE2E tests that use custom grids (listed below) on Hera.  All were successful.
* `custom_ESGgrid`
* `custom_GFDLgrid`
* `custom_GFDLgrid__GFDLgrid_USE_NUM_CELLS_IN_FILENAMES_eq_FALSE` (previously `custom_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_FALSE`)
* `custom_GFDLgrid__GFDLgrid_USE_NUM_CELLS_IN_FILENAMES_eq_TRUE` (previously `custom_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_TRUE`)

## DEPENDENCIES:
PR #[310](ufs-community/ufs-srweather-app#310) in `ufs-srweather-app`.

## DOCUMENTATION:
Updates to documentation are in PR #[310](ufs-community/ufs-srweather-app#310) in `ufs-srweather-app`.
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.

1 participant