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

Jump to bottom

[develop] Transition the var_defns bash file to YAML. #1098

Merged
merged 43 commits into from
Jul 26, 2024
Merged

[develop] Transition the var_defns bash file to YAML. #1098

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
55b500b
WIP
christinaholtNOAA Apr 11, 2024
46c4805
Add machine to command
christinaholtNOAA Apr 11, 2024
87e549f
Keep same environment behavior for AQM jobs.
christinaholtNOAA Apr 11, 2024
59d07d4
WIP
christinaholtNOAA Apr 18, 2024
446f6eb
Finished up first round of ex-scripts
christinaholtNOAA Apr 18, 2024
38f9daa
Order docs.
christinaholtNOAA Apr 18, 2024
8496c68
Order jobs.
christinaholtNOAA Apr 18, 2024
e5b28da
Ordering for sourced files.
christinaholtNOAA Apr 18, 2024
16da1ef
Cleaning up old functionality.
christinaholtNOAA Apr 18, 2024
444f1f0
WIP
christinaholtNOAA Apr 18, 2024
a12f6fb
WIP
christinaholtNOAA Apr 19, 2024
4bec6b7
WIP
christinaholtNOAA Apr 19, 2024
0d86ab0
Fix all the subshell problems.
christinaholtNOAA Apr 19, 2024
a6513cb
Merge remote-tracking branch 'origin/develop' into to_yaml
christinaholtNOAA Apr 23, 2024
f08e3ef
Boolified.
christinaholtNOAA Apr 27, 2024
94d7970
WIP
christinaholtNOAA Jun 11, 2024
4ef89f6
Merge remote-tracking branch 'origin/develop' into to_yaml
christinaholtNOAA Jun 11, 2024
874af4b
Bump uwtools version.
christinaholtNOAA Jun 11, 2024
d2a0bc2
Source from a function.
christinaholtNOAA Jun 11, 2024
253590f
WIP
christinaholtNOAA Jun 17, 2024
e242490
Add nco section to be sourced always.
christinaholtNOAA Jun 18, 2024
241ef5d
A bit of clean up
christinaholtNOAA Jun 18, 2024
f360da3
Update jobs/JREGIONAL_MAKE_OROG
christinaholtNOAA Jun 28, 2024
b31f6c7
Applying suggested changes from review.
christinaholtNOAA Jul 12, 2024
2ed368f
Update docs for default values.
christinaholtNOAA Jul 12, 2024
8b9eb07
Merge branch 'to_yaml' of https://github.com/ChristinaholtNOAA/ufs-sr…
christinaholtNOAA Jul 12, 2024
0a8cf97
Merge branch 'develop' of https://github.com/ufs-community/ufs-srweat…
christinaholtNOAA Jul 12, 2024
5502cdc
This should no longer be an executable bash file.
christinaholtNOAA Jul 12, 2024
b368974
Linting.
christinaholtNOAA Jul 13, 2024
b7bacbc
Addressing PR comments.
christinaholtNOAA Jul 15, 2024
d7378dc
Apply suggestions from code review
christinaholtNOAA Jul 15, 2024
e29b3b4
Fix reported stat namespace collision.
christinaholtNOAA Jul 16, 2024
d3f40c6
Merge branch 'to_yaml' of https://github.com/ChristinaholtNOAA/ufs-sr…
christinaholtNOAA Jul 16, 2024
8f7ac15
Apply suggestions from code review
christinaholtNOAA Jul 17, 2024
50be36a
Missed one!
christinaholtNOAA Jul 17, 2024
1acdb48
Making additional PR requested changes.
christinaholtNOAA Jul 17, 2024
ce0a6e6
Merge branch 'to_yaml' of https://github.com/ChristinaholtNOAA/ufs-sr…
christinaholtNOAA Jul 17, 2024
ff4f030
[to_yaml] Update wrapper scripts to allow them to run using var_defns…
MichaelLueken Jul 23, 2024
1afdf51
Merge pull request #4 from MichaelLueken/to_yaml
christinaholtNOAA Jul 23, 2024
060ecc9
Remove tests that are no longer relevant.
christinaholtNOAA Jul 23, 2024
072e8eb
Merge branch 'to_yaml' of https://github.com/ChristinaholtNOAA/ufs-sr…
christinaholtNOAA Jul 23, 2024
2ce08ae
[to_yaml] Update .cicd/scripts/wrapper_srw_ftest.sh to add third argu…
MichaelLueken Jul 25, 2024
85070ad
Merge pull request #5 from MichaelLueken/to_yaml
christinaholtNOAA Jul 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev Previous commit
Next Next commit
Keep same environment behavior for AQM jobs.
  • Loading branch information
@christinaholtNOAA
christinaholtNOAA committed Apr 11, 2024
commit 87e549fbbea765c032f1910230207724ff35ae12
7 changes: 6 additions & 1 deletion jobs/JSRW_AQM_ICS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,12 @@ export SCRIPTSsrw="${HOMEdir}/scripts"
#
export USHdir="${USHsrw}" # should be removed later
. ${USHsrw}/source_util_funcs.sh
source_config_for_task "task_aqm_ics" ${GLOBAL_VAR_DEFNS_FP}
for sect in (user platform workflow nco global cpl_aqm_parm cpl_aqm_parm task_aqm_ics) ; do
for var in $(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
--output-block ${sect}) ; do
export $var
done
done
#
#-----------------------------------------------------------------------
#
Expand Down
8 changes: 7 additions & 1 deletion jobs/JSRW_AQM_LBCS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,13 @@ export SCRIPTSsrw="${HOMEdir}/scripts"
#
export USHdir="${USHsrw}" # should be removed later
. ${USHsrw}/source_util_funcs.sh
source_config_for_task "task_get_extrn_lbcs|task_make_orog|task_make_lbcs|cpl_aqm_parm|task_aqm_lbcs" ${GLOBAL_VAR_DEFNS_FP}
for sect in ( user platform workflow nco global cpl_aqm_parm cpl_aqm_parm task_get_extrn_lbcs \
task_make_orog task_make_lbcs task_aqm_lbcs ) ; do
for var in $(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
--output-block ${sect}) ; do
export $var
done
done
#
#-----------------------------------------------------------------------
#
Expand Down
8 changes: 7 additions & 1 deletion jobs/JSRW_BIAS_CORRECTION_O3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,13 @@ export SCRIPTSsrw="${HOMEdir}/scripts"
#
export USHdir="${USHsrw}" # should be removed later
. ${USHsrw}/source_util_funcs.sh
source_config_for_task "cpl_aqm_parm|task_run_post|task_bias_correction_o3" ${GLOBAL_VAR_DEFNS_FP}
for sect in (user platform workflow nco global cpl_aqm_parm cpl_aqm_parm task_run_post \
task_bias_correction_o3) ; do
for var in $(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
--output-block ${sect}) ; do
export $var
done
done
#
#-----------------------------------------------------------------------
#
Expand Down
8 changes: 7 additions & 1 deletion jobs/JSRW_BIAS_CORRECTION_PM25
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,13 @@ export SCRIPTSsrw="${HOMEdir}/scripts"
#
export USHdir="${USHsrw}" # should be removed later
. ${USHsrw}/source_util_funcs.sh
source_config_for_task "cpl_aqm_parm|task_run_post|task_bias_correction_pm25" ${GLOBAL_VAR_DEFNS_FP}
for sect in (user platform workflow nco global cpl_aqm_parm cpl_aqm_parm task_run_post \
task_bias_correction_pm25) ; do
for var in $(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
--output-block ${sect}) ; do
export $var
done
done
#
#-----------------------------------------------------------------------
#
Expand Down
7 changes: 6 additions & 1 deletion jobs/JSRW_FIRE_EMISSION
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,12 @@ export SCRIPTSsrw="${HOMEdir}/scripts"
#
export USHdir="${USHsrw}" # should be removed later
. ${USHsrw}/source_util_funcs.sh
source_config_for_task "cpl_aqm_parm|task_fire_emission" ${GLOBAL_VAR_DEFNS_FP}
for sect in (user platform workflow nco global cpl_aqm_parm cpl_aqm_parm task_fire_emission) ; do
for var in $(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
--output-block ${sect}) ; do
export $var
done
done
#
#-----------------------------------------------------------------------
#
Expand Down
7 changes: 6 additions & 1 deletion jobs/JSRW_NEXUS_EMISSION
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,12 @@ export SCRIPTSsrw="${HOMEdir}/scripts"
#
export USHdir="${USHsrw}" # should be removed later
. ${USHsrw}/source_util_funcs.sh
source_config_for_task "task_run_fcst|cpl_aqm_parm|task_nexus_emission" ${GLOBAL_VAR_DEFNS_FP}
for sect in (user platform workflow nco global cpl_aqm_parm cpl_aqm_parm task_nexus_emission) ; do
for var in $(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
--output-block ${sect}) ; do
export $var
done
done
#
#-----------------------------------------------------------------------
#
Expand Down
7 changes: 6 additions & 1 deletion jobs/JSRW_NEXUS_GFS_SFC
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,12 @@ export SCRIPTSsrw="${HOMEdir}/scripts"
#
export USHdir="${USHsrw}" # should be removed later
. ${USHsrw}/source_util_funcs.sh
source_config_for_task "cpl_aqm_parm|task_nexus_gfs_sfc" ${GLOBAL_VAR_DEFNS_FP}
for sect in (user platform workflow nco global cpl_aqm_parm cpl_aqm_parm task_nexus_gfs_sfc) ; do
for var in $(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
--output-block ${sect}) ; do
export $var
done
done
#
#-----------------------------------------------------------------------
#
Expand Down
7 changes: 6 additions & 1 deletion jobs/JSRW_NEXUS_POST_SPLIT
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,12 @@ export SCRIPTSsrw="${HOMEdir}/scripts"
#
export USHdir="${USHsrw}" # should be removed later
. ${USHsrw}/source_util_funcs.sh
source_config_for_task "cpl_aqm_parm|task_nexus_post_split" ${GLOBAL_VAR_DEFNS_FP}
for sect in (user platform workflow nco global cpl_aqm_parm cpl_aqm_parm task_nexus_post_split) ; do
for var in $(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
--output-block ${sect}) ; do
export $var
done
done
#
#-----------------------------------------------------------------------
#
Expand Down
8 changes: 7 additions & 1 deletion jobs/JSRW_POINT_SOURCE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,13 @@ export SCRIPTSsrw="${HOMEdir}/scripts"
#
export USHdir="${USHsrw}" # should be removed later
. ${USHsrw}/source_util_funcs.sh
source_config_for_task "task_run_fcst|cpl_aqm_parm|task_point_source" ${GLOBAL_VAR_DEFNS_FP}
for sect in (user platform workflow nco global cpl_aqm_parm cpl_aqm_parm task_point_source \
task_run_fcst) ; do
for var in $(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
--output-block ${sect}) ; do
export $var
done
done
#
#-----------------------------------------------------------------------
#
Expand Down
8 changes: 7 additions & 1 deletion jobs/JSRW_POST_STAT_O3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,13 @@ export SCRIPTSsrw="${HOMEdir}/scripts"
#
export USHdir="${USHsrw}" # should be removed later
. ${USHsrw}/source_util_funcs.sh
source_config_for_task "cpl_aqm_parm|task_run_post|task_post_stat_o3" ${GLOBAL_VAR_DEFNS_FP}
for sect in (user platform workflow nco global cpl_aqm_parm cpl_aqm_parm task_post_stat_o3 \
task_run_post) ; do
for var in $(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
--output-block ${sect}) ; do
export $var
done
done
. $USHdir/job_preamble.sh
#
#-----------------------------------------------------------------------
Expand Down
8 changes: 7 additions & 1 deletion jobs/JSRW_POST_STAT_PM25
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,13 @@ export SCRIPTSsrw="${HOMEdir}/scripts"
#
export USHdir="${USHsrw}" # should be removed later
. ${USHsrw}/source_util_funcs.sh
source_config_for_task "cpl_aqm_parm|task_run_post|task_post_stat_pm25" ${GLOBAL_VAR_DEFNS_FP}
for sect in (user platform workflow nco global cpl_aqm_parm cpl_aqm_parm task_post_stat_pm25 \
task_run_post) ; do
for var in $(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
--output-block ${sect}) ; do
export $var
done
done
#
#-----------------------------------------------------------------------
#
Expand Down
7 changes: 6 additions & 1 deletion jobs/JSRW_PRE_POST_STAT
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,12 @@ export SCRIPTSsrw="${HOMEdir}/scripts"
#
export USHdir="${USHsrw}" # should be removed later
. ${USHsrw}/source_util_funcs.sh
source_config_for_task "task_pre_post_stat" ${GLOBAL_VAR_DEFNS_FP}
for sect in (user platform workflow nco global cpl_aqm_parm cpl_aqm_parm task_pre_post_stat) ; do
for var in $(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
--output-block ${sect}) ; do
export $var
done
done
#
#-----------------------------------------------------------------------
#
Expand Down