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.

Sign up for GitHub

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

Update enkf archive jobs to use COMIN/COMOUT #3393

Merged
merged 5 commits into from
Feb 28, 2025
+2 −4
Merged

Update enkf archive jobs to use COMIN/COMOUT #3393

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dbb536c
chang COM_TOP into COMIN_TOP
mingshichen-noaa Feb 14, 2025
1ab221f
update exgdas_enkf_earc_tars.py & exgdas_enkf_earc_vrfy.py
mingshichen-noaa Feb 14, 2025
7884a86
Merge branch 'NOAA-EMC:develop' into feature/jgdas_enkf_archive_tars_…
mingshichen-noaa Feb 20, 2025
5b0aaeb
remove COM_TOP variables
mingshichen-noaa Feb 27, 2025
52ff889
Merge branch 'develop' into feature/jgdas_enkf_archive_tars_vrfy
mingshichen-noaa Feb 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion jobs/JGDAS_ENKF_ARCHIVE_TARS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "earc_tars" -c "base earc_tars"
##############################################
# Set variables used in the script
##############################################
YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COM_TOP
YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
COMIN_TOP:COM_TOP_TMPL
Copy link
Contributor

Choose a reason for hiding this comment

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

Looking through the archive scripts and config files, I do not see any references to COM*TOP, so I think I put this in here by accident. Instead of renaming this to COMIN_TOP, let's just get rid of the variable.

Suggested change
YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
COMIN_TOP:COM_TOP_TMPL

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@DavidHuber-NOAA
I agree with your comments. I have removed COM*TOP variables.

Copy link
Contributor

Choose a reason for hiding this comment

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

I think it was a holdover from before the cleanup job was broken out.

MEMDIR="ensstat" YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
COMIN_ATMOS_ANALYSIS_ENSSTAT:COM_ATMOS_ANALYSIS_TMPL \
COMIN_ATMOS_HISTORY_ENSSTAT:COM_ATMOS_HISTORY_TMPL \
Expand Down
3 changes: 2 additions & 1 deletion jobs/JGDAS_ENKF_ARCHIVE_VRFY
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "earc_vrfy" -c "base earc_vrfy"
##############################################
# Set variables used in the script
##############################################
YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COM_TOP
YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
COMIN_TOP:COM_TOP_TMPL
MEMDIR="ensstat" YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
COMIN_ATMOS_ANALYSIS_ENSSTAT:COM_ATMOS_ANALYSIS_TMPL \
COMIN_ATMOS_HISTORY_ENSSTAT:COM_ATMOS_HISTORY_TMPL \
Expand Down
2 changes: 1 addition & 1 deletion scripts/exgdas_enkf_earc_tars.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def main():

# Also import all COMIN* directory and template variables
for key in archive.task_config.keys():
if key.startswith("COM"):
if key.startswith("COMIN"):
archive_dict[key] = archive.task_config[key]

cwd = os.getcwd()
Expand Down
2 changes: 1 addition & 1 deletion scripts/exgdas_enkf_earc_vrfy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def main():

# Also import all COMIN* directory and template variables
for key in archive.task_config.keys():
if key.startswith("COM"):
if key.startswith("COMIN"):
archive_dict[key] = archive.task_config[key]

cwd = os.getcwd()
Expand Down