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

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

Open
wants to merge 43 commits into
base: develop
Choose a base branch
from
Open
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Source from a function.
  • Loading branch information
christinaholtNOAA committed Jun 11, 2024
commit d2a0bc2cf62e521645b00c7d0aeba08e6b0a4843
5 changes: 1 addition & 4 deletions jobs/JREGIONAL_CHECK_POST_OUTPUT
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,7 @@
#
. $USHdir/source_util_funcs.sh
for sect in user workflow ; do
while read -r line ; do
source <( echo "${line}" )
done < <(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
--output-block ${sect})
source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
done
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This is the pattern I've added to explicitly state which sections of the var_defns file should be "sourced". The bash util helps us run a UW tool that translates YAML to bash and then exports it line-by-line.

This sort of thing will go away with a full integration of uwtools drivers (planned work in upcoming EPIC PI 13).

. $USHdir/job_preamble.sh
#
Expand Down
4 changes: 1 addition & 3 deletions jobs/JREGIONAL_GET_EXTRN_MDL_FILES
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,7 @@
#
. $USHdir/source_util_funcs.sh
for sect in user workflow task_get_extrn_lbcs task_get_extrn_ics ; do
source <( echo "${line}" )
done < <(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
--output-block ${sect})
source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
done
. $USHdir/job_preamble.sh

Expand Down
5 changes: 1 addition & 4 deletions jobs/JREGIONAL_GET_VERIF_OBS
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,7 @@
#
. $USHdir/source_util_funcs.sh
for sect in user ; do
while read -r line ; do
source <( echo "${line}" )
done < <(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
--output-block ${sect})
source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
done
. $USHdir/job_preamble.sh
#
Expand Down
5 changes: 1 addition & 4 deletions jobs/JREGIONAL_INTEGRATION_TEST
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,7 @@
#
. $USHdir/source_util_funcs.sh
for sect in user workflow ; do
while read -r line ; do
source <( echo "${line}" )
done < <(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
--output-block ${sect})
source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
done
. $USHdir/job_preamble.sh

Expand Down
5 changes: 1 addition & 4 deletions jobs/JREGIONAL_MAKE_GRID
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,7 @@
#
. $USHdir/source_util_funcs.sh
for sect in user workflow task_make_grid ; do
while read -r line ; do
source <( echo "${line}" )
done < <(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
--output-block ${sect})
source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
done
. $USHdir/job_preamble.sh
#
Expand Down
5 changes: 1 addition & 4 deletions jobs/JREGIONAL_MAKE_ICS
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,7 @@
#
. $USHdir/source_util_funcs.sh
for sect in user ; do
while read -r line ; do
source <( echo "${line}" )
done < <(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
--output-block ${sect})
source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
done
. $USHdir/job_preamble.sh
#
Expand Down
5 changes: 1 addition & 4 deletions jobs/JREGIONAL_MAKE_LBCS
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,7 @@
#
. $USHdir/source_util_funcs.sh
for sect in user ; do
while read -r line ; do
source <( echo "${line}" )
done < <(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
--output-block ${sect})
source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
done
. $USHdir/job_preamble.sh
#
Expand Down
5 changes: 1 addition & 4 deletions jobs/JREGIONAL_MAKE_OROG
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,7 @@
#
. $USHdir/source_util_funcs.sh
for sect in user task_make_orog ; do
while read -r line ; do
source <( echo "${line}" )
done < <(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
--output-block ${sect})
source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
done
. $USHdir/job_preamble.sh
#
Expand Down
5 changes: 1 addition & 4 deletions jobs/JREGIONAL_MAKE_SFC_CLIMO
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,7 @@
#
. $USHdir/source_util_funcs.sh
for sect in user workflow task_make_sfc_climo ; do
while read -r line ; do
source <( echo "${line}" )
done < <(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
--output-block ${sect})
source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
done
. $USHdir/job_preamble.sh
#
Expand Down
5 changes: 1 addition & 4 deletions jobs/JREGIONAL_PLOT_ALLVARS
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,7 @@
#
. $USHdir/source_util_funcs.sh
for sect in user platform workflow task_plot_allvars task_run_fcst ; do
while read -r line ; do
source <( echo "${line}" )
done < <(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
--output-block ${sect})
source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
done
. $USHdir/job_preamble.sh
#
Expand Down
5 changes: 1 addition & 4 deletions jobs/JREGIONAL_RUN_FCST
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,7 @@
#
. $USHdir/source_util_funcs.sh
for sect in user workflow ; do
while read -r line ; do
source <( echo "${line}" )
done < <(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
--output-block ${sect})
source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
done
. $USHdir/job_preamble.sh "TRUE"
#
Expand Down
5 changes: 1 addition & 4 deletions jobs/JREGIONAL_RUN_MET_GENENSPROD_OR_ENSEMBLESTAT
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,7 @@
#
. $USHdir/source_util_funcs.sh
for sect in user ; do
while read -r line ; do
source <( echo "${line}" )
done < <(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
--output-block ${sect})
source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
done
. $USHdir/job_preamble.sh
#
Expand Down
5 changes: 1 addition & 4 deletions jobs/JREGIONAL_RUN_MET_GRIDSTAT_OR_POINTSTAT_VX
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,7 @@
#
. $USHdir/source_util_funcs.sh
for sect in user ; do
while read -r line ; do
source <( echo "${line}" )
done < <(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
--output-block ${sect})
source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
done
. $USHdir/job_preamble.sh
#
Expand Down
5 changes: 1 addition & 4 deletions jobs/JREGIONAL_RUN_MET_GRIDSTAT_OR_POINTSTAT_VX_ENSMEAN
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,7 @@
#
. $USHdir/source_util_funcs.sh
for sect in user ; do
while read -r line ; do
source <( echo "${line}" )
done < <(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
--output-block ${sect})
source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
done
. $USHdir/job_preamble.sh
#
Expand Down
5 changes: 1 addition & 4 deletions jobs/JREGIONAL_RUN_MET_GRIDSTAT_OR_POINTSTAT_VX_ENSPROB
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,7 @@
#
. $USHdir/source_util_funcs.sh
for sect in user ; do
while read -r line ; do
source <( echo "${line}" )
done < <(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
--output-block ${sect})
source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
done
. $USHdir/job_preamble.sh
#
Expand Down
5 changes: 1 addition & 4 deletions jobs/JREGIONAL_RUN_MET_PB2NC_OBS
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,7 @@
#
. $USHdir/source_util_funcs.sh
for sect in user ; do
while read -r line ; do
source <( echo "${line}" )
done < <(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
--output-block ${sect})
source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
done
. $USHdir/job_preamble.sh
#
Expand Down
5 changes: 1 addition & 4 deletions jobs/JREGIONAL_RUN_MET_PCPCOMBINE
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,7 @@
#
. $USHdir/source_util_funcs.sh
for sect in user ; do
while read -r line ; do
source <( echo "${line}" )
done < <(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
--output-block ${sect})
source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
done
. $USHdir/job_preamble.sh
#
Expand Down
5 changes: 1 addition & 4 deletions jobs/JREGIONAL_RUN_POST
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,7 @@
#
. $USHdir/source_util_funcs.sh
for sect in user platform workflow task_run_post ; do
while read -r line ; do
source <( echo "${line}" )
done < <(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
--output-block ${sect})
source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
done
. $USHdir/job_preamble.sh
#
Expand Down
5 changes: 1 addition & 4 deletions jobs/JREGIONAL_RUN_PRDGEN
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,7 @@
#
. $USHdir/source_util_funcs.sh
for sect in user platform workflow task_run_post ; do
while read -r line ; do
source <( echo "${line}" )
done < <(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
--output-block ${sect})
source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
done
. $USHdir/job_preamble.sh
#
Expand Down
5 changes: 1 addition & 4 deletions jobs/JSRW_AQM_ICS
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,7 @@ export SCRIPTSsrw="${HOMEdir}/scripts"
export USHdir="${USHsrw}" # should be removed later
. ${USHsrw}/source_util_funcs.sh
for sect in user platform workflow nco global cpl_aqm_parm cpl_aqm_parm task_aqm_ics ; do
while read -r line ; do
source <( echo "${line}" )
done < <(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
--output-block ${sect})
source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
done
#
#-----------------------------------------------------------------------
Expand Down
5 changes: 1 addition & 4 deletions jobs/JSRW_AQM_LBCS
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,7 @@ export USHdir="${USHsrw}" # should be removed later
. ${USHsrw}/source_util_funcs.sh
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
christinaholtNOAA marked this conversation as resolved.
Show resolved Hide resolved
while read -r line ; do
source <( echo "${line}" )
done < <(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
--output-block ${sect})
source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
done
#
#-----------------------------------------------------------------------
Expand Down
5 changes: 1 addition & 4 deletions jobs/JSRW_BIAS_CORRECTION_O3
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,7 @@ export USHdir="${USHsrw}" # should be removed later
. ${USHsrw}/source_util_funcs.sh
for sect in user platform workflow nco global cpl_aqm_parm cpl_aqm_parm task_run_post \
task_bias_correction_o3 ; do
while read -r line ; do
source <( echo "${line}" )
done < <(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
--output-block ${sect})
source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
done
#
#-----------------------------------------------------------------------
Expand Down
5 changes: 1 addition & 4 deletions jobs/JSRW_BIAS_CORRECTION_PM25
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,7 @@ export USHdir="${USHsrw}" # should be removed later
. ${USHsrw}/source_util_funcs.sh
for sect in user platform workflow nco global cpl_aqm_parm cpl_aqm_parm task_run_post \
task_bias_correction_pm25 ; do
while read -r line ; do
source <( echo "${line}" )
done < <(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
--output-block ${sect})
source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
done
#
#-----------------------------------------------------------------------
Expand Down
5 changes: 1 addition & 4 deletions jobs/JSRW_FIRE_EMISSION
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,7 @@ export SCRIPTSsrw="${HOMEdir}/scripts"
export USHdir="${USHsrw}" # should be removed later
. ${USHsrw}/source_util_funcs.sh
for sect in user platform workflow nco global cpl_aqm_parm cpl_aqm_parm task_fire_emission ; do
while read -r line ; do
source <( echo "${line}" )
done < <(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
--output-block ${sect})
source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
done
#
#-----------------------------------------------------------------------
Expand Down
5 changes: 1 addition & 4 deletions jobs/JSRW_NEXUS_EMISSION
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,7 @@ export SCRIPTSsrw="${HOMEdir}/scripts"
export USHdir="${USHsrw}" # should be removed later
. ${USHsrw}/source_util_funcs.sh
for sect in user platform workflow nco global cpl_aqm_parm cpl_aqm_parm task_nexus_emission ; do
while read -r line ; do
source <( echo "${line}" )
done < <(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
--output-block ${sect})
source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
done
#
#-----------------------------------------------------------------------
Expand Down
5 changes: 1 addition & 4 deletions jobs/JSRW_NEXUS_GFS_SFC
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,7 @@ export SCRIPTSsrw="${HOMEdir}/scripts"
export USHdir="${USHsrw}" # should be removed later
. ${USHsrw}/source_util_funcs.sh
for sect in user platform workflow nco global cpl_aqm_parm cpl_aqm_parm task_nexus_gfs_sfc ; do
while read -r line ; do
source <( echo "${line}" )
done < <(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
--output-block ${sect})
source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
done
#
#-----------------------------------------------------------------------
Expand Down
5 changes: 1 addition & 4 deletions jobs/JSRW_NEXUS_POST_SPLIT
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,7 @@ export SCRIPTSsrw="${HOMEdir}/scripts"
export USHdir="${USHsrw}" # should be removed later
. ${USHsrw}/source_util_funcs.sh
for sect in user platform workflow nco global cpl_aqm_parm cpl_aqm_parm task_nexus_post_split ; do
while read -r line ; do
source <( echo "${line}" )
done < <(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
--output-block ${sect})
source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
done
#
#-----------------------------------------------------------------------
Expand Down
5 changes: 1 addition & 4 deletions jobs/JSRW_POINT_SOURCE
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,7 @@ export USHdir="${USHsrw}" # should be removed later
. ${USHsrw}/source_util_funcs.sh
for sect in user platform workflow nco global cpl_aqm_parm cpl_aqm_parm task_point_source \
task_run_fcst ; do
while read -r line ; do
source <( echo "${line}" )
done < <(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
--output-block ${sect})
source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
done
#
#-----------------------------------------------------------------------
Expand Down
5 changes: 1 addition & 4 deletions jobs/JSRW_POST_STAT_O3
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,7 @@ export USHdir="${USHsrw}" # should be removed later
. ${USHsrw}/source_util_funcs.sh
for sect in user platform workflow nco global cpl_aqm_parm cpl_aqm_parm task_post_stat_o3 \
task_run_post ; do
while read -r line ; do
source <( echo "${line}" )
done < <(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
--output-block ${sect})
source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
done
. $USHdir/job_preamble.sh
#
Expand Down
5 changes: 1 addition & 4 deletions jobs/JSRW_POST_STAT_PM25
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,7 @@ export USHdir="${USHsrw}" # should be removed later
. ${USHsrw}/source_util_funcs.sh
for sect in user platform workflow nco global cpl_aqm_parm cpl_aqm_parm task_post_stat_pm25 \
task_run_post ; do
while read -r line ; do
source <( echo "${line}" )
done < <(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
--output-block ${sect})
source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
done
#
#-----------------------------------------------------------------------
Expand Down
5 changes: 1 addition & 4 deletions jobs/JSRW_PRE_POST_STAT
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,7 @@ export SCRIPTSsrw="${HOMEdir}/scripts"
export USHdir="${USHsrw}" # should be removed later
. ${USHsrw}/source_util_funcs.sh
for sect in user platform workflow nco global cpl_aqm_parm cpl_aqm_parm task_pre_post_stat ; do
while read -r line ; do
source <( echo "${line}" )
done < <(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
--output-block ${sect})
source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
done
#
#-----------------------------------------------------------------------
Expand Down
5 changes: 1 addition & 4 deletions scripts/exregional_check_post_output.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,7 @@
#
. $USHdir/source_util_funcs.sh
for sect in user workflow global verification constants ; do
while read -r line ; do
source <( echo "${line}" )
done < <(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
--output-block ${sect})
source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
done
#
#-----------------------------------------------------------------------
Expand Down
5 changes: 1 addition & 4 deletions scripts/exregional_get_extrn_mdl_files.sh
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,7 @@
. $USHdir/source_util_funcs.sh
for sect in user platform workflow global task_get_extrn_lbcs \
task_get_extrn_ics ; do
while read -r line ; do
source <( echo "${line}" )
done < <(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
--output-block ${sect})
source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
done
#
#-----------------------------------------------------------------------
Expand Down
Loading