Skip to content

[develop] Rename variables related to GFDLgrid-type grids#787

Merged
gsketefian merged 7 commits into
ufs-community:developfrom
gsketefian:feature/domain_name
Jun 27, 2022
Merged

[develop] Rename variables related to GFDLgrid-type grids#787
gsketefian merged 7 commits into
ufs-community:developfrom
gsketefian:feature/domain_name

Conversation

@gsketefian
Copy link
Copy Markdown
Collaborator

@gsketefian gsketefian commented Jun 5, 2022

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 in ufs-srweather-app.

DOCUMENTATION:

Updates to documentation are in PR #310 in ufs-srweather-app.

…nition of the variable POST_OUTPUT_DOMAIN_NAME to at the beginning of the custom grid definition because it is really the name of the custom native grid.
@gsketefian gsketefian changed the title In WE2E tests that use custom grids, move definition of POST_OUTPUT_DOMAIN_NAME to start of custom grid definition In WE2E tests that use custom grids, move setting of POST_OUTPUT_DOMAIN_NAME to start of custom grid definition Jun 5, 2022
@gsketefian gsketefian marked this pull request as ready for review June 5, 2022 07:51
@gsketefian gsketefian changed the title In WE2E tests that use custom grids, move setting of POST_OUTPUT_DOMAIN_NAME to start of custom grid definition [develop] In WE2E tests that use custom grids, move setting of POST_OUTPUT_DOMAIN_NAME to start of custom grid definition Jun 13, 2022
1) Rename GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES to GFDLgrid_USE_NUM_CELLS_IN_FILENAMES.
2) Rename GFDLgrid_RES to GFDLgrid_NUM_CELLS.
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.
@gsketefian gsketefian changed the title [develop] In WE2E tests that use custom grids, move setting of POST_OUTPUT_DOMAIN_NAME to start of custom grid definition [develop] Rename variables related to GFDLgrid-type grids Jun 14, 2022
Copy link
Copy Markdown
Collaborator

@willmayfield willmayfield left a comment

Choose a reason for hiding this comment

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

Approving with one comment.

Comment thread ush/config_defaults.sh Outdated
# GFDLgrid_NUM_CELLS:
# Number of grid cells in each of the two horizontal directions (x and
# y) on each tile of the parent global grid. Note that the name of this
# parameter is really a misnomer because although it has the stirng "RES"
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Shouldn't the discussion of "RES" be removed if taking it out of the variable name? (Also there's a typo "stirng")

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

@willmayfield Yes, it should! I'll fix it.

@gsketefian gsketefian merged commit 5359633 into ufs-community:develop Jun 27, 2022
gsketefian added a commit to ufs-community/ufs-srweather-app that referenced this pull request Jun 27, 2022
## DESCRIPTION OF CHANGES: 
Rename experiment variables to match changes in PR #[787](ufs-community/regional_workflow#787) in `regional_workflow`.

## TESTS CONDUCTED: 
None needed.

## DEPENDENCIES:
PR #[787](ufs-community/regional_workflow#787) in `regional_workflow`.
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.

4 participants