Merge pull request #4 from MichaelLueken/to_yaml

[to_yaml] Update wrapper scripts to allow them to run using var_defns.yaml
christinaholtNOAA · Jul 23, 2024 · 1afdf51 · 1afdf51
2 parents ce0a6e6 + ff4f030
commit 1afdf51
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 18 deletions.
diff --git a/ush/wrappers/run_fcst.sh b/ush/wrappers/run_fcst.sh
@@ -1,7 +1,10 @@
 #!/usr/bin/env bash
-export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh"
+export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.yaml"
+. $USHdir/source_util_funcs.sh
+for sect in workflow ; do
+  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
+done
 set -xa
-source ${GLOBAL_VAR_DEFNS_FP}
 export CDATE=${DATE_FIRST_CYCL}
 export CYCLE_DIR=${EXPTDIR}/${CDATE}
 export cyc=${DATE_FIRST_CYCL:8:2}

diff --git a/ush/wrappers/run_get_ics.sh b/ush/wrappers/run_get_ics.sh
@@ -1,7 +1,10 @@
 #!/usr/bin/env bash
-export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh"
+export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.yaml"
+. $USHdir/source_util_funcs.sh
+for sect in workflow task_get_extrn_ics ; do
+  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
+done
 set -xa
-source ${GLOBAL_VAR_DEFNS_FP}
 export CDATE=${DATE_FIRST_CYCL}
 export CYCLE_DIR=${EXPTDIR}/${CDATE}
 export cyc=${DATE_FIRST_CYCL:8:2}

diff --git a/ush/wrappers/run_get_lbcs.sh b/ush/wrappers/run_get_lbcs.sh
@@ -1,7 +1,10 @@
 #!/usr/bin/env bash
-export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh"
+export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.yaml"
+. $USHdir/source_util_funcs.sh
+for sect in workflow task_get_extrn_lbcs ; do
+  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
+done
 set -xa
-source ${GLOBAL_VAR_DEFNS_FP}
 export CDATE=${DATE_FIRST_CYCL}
 export CYCLE_DIR=${EXPTDIR}/${CDATE}
 export cyc=${DATE_FIRST_CYCL:8:2}

diff --git a/ush/wrappers/run_make_grid.sh b/ush/wrappers/run_make_grid.sh
@@ -1,7 +1,10 @@
 #!/usr/bin/env bash
-export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh"
+export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.yaml"
+. $USHdir/source_util_funcs.sh
+for sect in workflow ; do
+  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
+done
 set -xa
-source ${GLOBAL_VAR_DEFNS_FP}
 
 export CDATE=${DATE_FIRST_CYCL}
 export CYCLE_DIR=${EXPTDIR}/${CDATE}

diff --git a/ush/wrappers/run_make_ics.sh b/ush/wrappers/run_make_ics.sh
@@ -1,7 +1,10 @@
 #!/usr/bin/env bash
-export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh"
+export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.yaml"
+. $USHdir/source_util_funcs.sh
+for sect in workflow ; do
+  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
+done
 set -xa
-source ${GLOBAL_VAR_DEFNS_FP}
 export CDATE=${DATE_FIRST_CYCL}
 export CYCLE_DIR=${EXPTDIR}/${CDATE}
 export cyc=${DATE_FIRST_CYCL:8:2}

diff --git a/ush/wrappers/run_make_lbcs.sh b/ush/wrappers/run_make_lbcs.sh
@@ -1,7 +1,10 @@
 #!/usr/bin/env bash
-export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh"
+export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.yaml"
+. $USHdir/source_util_funcs.sh
+for sect in workflow ; do
+  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
+done
 set -xa
-source ${GLOBAL_VAR_DEFNS_FP}
 export CDATE=${DATE_FIRST_CYCL}
 export CYCLE_DIR=${EXPTDIR}/${CDATE}
 export cyc=${DATE_FIRST_CYCL:8:2}

diff --git a/ush/wrappers/run_make_orog.sh b/ush/wrappers/run_make_orog.sh
@@ -1,7 +1,10 @@
 #!/usr/bin/env bash
-export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh"
+export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.yaml"
+. $USHdir/source_util_funcs.sh
+for sect in workflow ; do
+  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
+done
 set -xa
-source ${GLOBAL_VAR_DEFNS_FP}
 
 export CDATE=${DATE_FIRST_CYCL}
 export CYCLE_DIR=${EXPTDIR}/${CDATE}

diff --git a/ush/wrappers/run_make_sfc_climo.sh b/ush/wrappers/run_make_sfc_climo.sh
@@ -1,7 +1,10 @@
 #!/usr/bin/env bash
-export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh"
+export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.yaml"
+. $USHdir/source_util_funcs.sh
+for sect in workflow ; do
+  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
+done
 set -xa
-source ${GLOBAL_VAR_DEFNS_FP}
 
 export CDATE=${DATE_FIRST_CYCL}
 export CYCLE_DIR=${EXPTDIR}/${CDATE}

diff --git a/ush/wrappers/run_post.sh b/ush/wrappers/run_post.sh
@@ -1,7 +1,10 @@
 #!/usr/bin/env bash
-export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh"
+export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.yaml"
+. $USHdir/source_util_funcs.sh
+for sect in workflow ; do
+  source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
+done
 set -xa
-source ${GLOBAL_VAR_DEFNS_FP}
 export CDATE=${DATE_FIRST_CYCL}
 export CYCLE_DIR=${EXPTDIR}/${CDATE}
 export cyc=${DATE_FIRST_CYCL:8:2}