-
Notifications
You must be signed in to change notification settings - Fork 208
Zero-diff changes to sfc updates, to speed up v17 #4659
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
Draft
ClaraDraper-NOAA
wants to merge
12
commits into
NOAA-EMC:dev/gfs.v17
Choose a base branch
from
ClaraDraper-NOAA:feature/speed_sfcanl
base: dev/gfs.v17
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+210
−85
Draft
Changes from 8 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
1f79961
Merge in hash and script changes for UFS_UTILS gcycle speed-up.
ClaraDraper-NOAA 82ae19e
bugfix
ClaraDraper-NOAA 4a77a4e
Fixed temporary branch name for ufs_utils.
ClaraDraper-NOAA 722cc04
First pass at splitting up sfcanl job.
ClaraDraper-NOAA a6d8849
Bug-fixes.
ClaraDraper-NOAA 08efd4a
bug fixes.
ClaraDraper-NOAA f77a4c1
typo
ClaraDraper-NOAA 0570c20
rename a and b to gcycle and regrid for sfcanl jobs
ClaraDraper-NOAA 4ad9f6f
Add land-iau off and no soil DA options back in.
ClaraDraper-NOAA 955d089
ammend.
ClaraDraper-NOAA 82f1d5a
Correct dependency for esfc job.
ClaraDraper-NOAA ac4ac2a
Apply suggestion from @github-actions[bot]
ClaraDraper-NOAA File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| #! /usr/bin/env bash | ||
|
|
||
| set -x | ||
|
|
||
| ############################################################### | ||
| # Source FV3GFS workflow modules | ||
| source "${HOMEgfs}/dev/ush/load_modules.sh" run | ||
| status=$? | ||
| if [[ ${status} -ne 0 ]]; then | ||
| exit "${status}" | ||
| fi | ||
|
|
||
| export job="sfcanlr" | ||
| export jobid="${job}.$$" | ||
|
|
||
| ############################################################### | ||
| # Execute the JJOB | ||
| "${HOMEgfs}/dev/jobs/JGLOBAL_ATMOS_SFCANL_REGRID" | ||
| status=$? | ||
|
|
||
| exit "${status}" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| #! /usr/bin/env bash | ||
|
|
||
| # for now, leave environment and config files un-changed. | ||
| source "${HOMEgfs}/ush/jjob_header.sh" -e "sfcanl" -c "base sfcanl" | ||
|
|
||
| ############################################## | ||
| # Begin JOB SPECIFIC work | ||
| ############################################## | ||
| # Ignore possible spelling error (nothing is misspelled) | ||
| # shellcheck disable=SC2153 | ||
| GDATE=$(date --utc -d "${PDY} ${cyc} - ${assim_freq} hours" +%Y%m%d%H) | ||
| export GDATE | ||
|
|
||
| BKG_RUN="gdas" | ||
| if [[ "${RUN}" == "gcafs" || "${RUN}" == "gcdas" ]]; then | ||
| BKG_RUN="gcdas" | ||
| fi | ||
|
|
||
| RUN=${BKG_RUN} YMD=${GDATE:0:8} HH=${GDATE:8:2} declare_from_tmpl -rx \ | ||
| COMIN_OBS_PREV:COM_OBS_TMPL \ | ||
| COMIN_ATMOS_RESTART_PREV:COM_ATMOS_RESTART_TMPL | ||
|
|
||
| YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ | ||
| COMIN_OBS:COM_OBS_TMPL \ | ||
| COMIN_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL \ | ||
| COMIN_SNOW_ANALYSIS:COM_SNOW_ANALYSIS_TMPL | ||
|
|
||
| YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ | ||
| COMOUT_ATMOS_RESTART:COM_ATMOS_RESTART_TMPL | ||
|
|
||
| RUN="enkfgdas" MEMDIR="ensstat" YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ | ||
| COMIN_ATMOS_ENKF_ANALYSIS_STAT:COM_ATMOS_ANALYSIS_TMPL | ||
|
|
||
| mkdir -p "${COMOUT_ATMOS_RESTART}" | ||
|
|
||
| # Use CFP to stage and save files in parallel | ||
| export USE_CFP=YES | ||
|
|
||
| ############################################################### | ||
| # Run relevant script | ||
|
|
||
| ${SFCANALSH:-${SCRgfs}/exglobal_atmos_sfcanl_gcycle.sh} && true | ||
| export err=$? | ||
| if [[ ${err} -ne 0 ]]; then | ||
| err_exit | ||
| fi | ||
|
|
||
| ############################################## | ||
| # End JOB SPECIFIC work | ||
| ############################################## | ||
|
|
||
| ############################################## | ||
| # Final processing | ||
| ############################################## | ||
| if [[ -e "${pgmout}" ]]; then | ||
| cat "${pgmout}" | ||
| fi | ||
|
|
||
| ########################################## | ||
| # Remove the Temporary working directory | ||
| ########################################## | ||
| cd "${DATAROOT}" || true | ||
| if [[ "${KEEPDATA}" == "NO" ]]; then | ||
| rm -rf "${DATA}" | ||
| fi | ||
|
|
||
| exit 0 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,53 @@ | ||||||
| #! /usr/bin/env bash | ||||||
|
|
||||||
| ################################################################################ | ||||||
| #### UNIX Script Documentation Block | ||||||
| # . . | ||||||
| # Script name: exglobal_atmos_sfcanl_regrid.sh | ||||||
| # Script description: Regrids land increments generated by GSI | ||||||
| # | ||||||
| # Author: Russ Treadon Org: NCEP/EMC Date: 2021-12-13 | ||||||
| # | ||||||
| # Abstract: Regrids land increments generated by GSI | ||||||
| # | ||||||
| # $Id$ | ||||||
| # | ||||||
| # Attributes: | ||||||
| # Language: POSIX shell | ||||||
| # | ||||||
| ################################################################################ | ||||||
|
|
||||||
| # Dependent Scripts and Executables | ||||||
| REGRIDSH=${REGRIDSH:-"${USHgfs}/regrid_gsiSfcIncr_to_tile.sh"} | ||||||
|
|
||||||
| if [[ "${DO_GSISOILDA}" == "YES" ]]; then | ||||||
|
|
||||||
| # Collect the dates in the window to update surface restarts | ||||||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. [shfmt] reported by reviewdog 🐶
Suggested change
|
||||||
| soilinc_fhrs=("${assim_freq}") # increment file at middle of window | ||||||
| LFHR="${assim_freq}" | ||||||
| if [[ "${DOIAU:-}" == "YES" ]]; then # Update surface restarts at beginning of window | ||||||
| half_window=$((assim_freq / 2)) | ||||||
| soilinc_fhrs+=("${half_window}") | ||||||
| LFHR=-1 | ||||||
| fi | ||||||
|
|
||||||
| export COMIN_SOIL_ANALYSIS_MEM="${COMIN_ATMOS_ENKF_ANALYSIS_STAT}" | ||||||
| export COMOUT_ATMOS_ANALYSIS_MEM="${COMIN_ATMOS_ANALYSIS}" | ||||||
| export CASE_IN="${CASE_ENS}" | ||||||
| export CASE_OUT="${CASE}" | ||||||
| export OCNRES_OUT="${OCNRES}" | ||||||
| export LFHR | ||||||
|
|
||||||
| "${REGRIDSH}" | ||||||
| export err=$? | ||||||
| if [[ ${err} -ne 0 ]]; then | ||||||
| err_exit "Soil increment file was not regridded correctly!" | ||||||
| fi | ||||||
|
|
||||||
| fi | ||||||
|
|
||||||
| ################################################################################ | ||||||
|
|
||||||
| exit "${err}" | ||||||
|
|
||||||
| ################################################################################ | ||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[shfmt] reported by reviewdog 🐶