From e257413ccfcc65141055db34f10e3865803643f3 Mon Sep 17 00:00:00 2001 From: gerard ketefian Date: Mon, 25 Nov 2024 12:30:52 -0700 Subject: [PATCH] Expand settings in workflow verification task config files that consist of code that has all been placed on one line to multiline code to make them more legible. --- parm/wflow/verify_det.yaml | 56 ++++++++++++++++++++++++++++++++------ parm/wflow/verify_ens.yaml | 55 +++++++++++++++++++++++++++++-------- parm/wflow/verify_pre.yaml | 48 +++++++++++++++++++++++++++----- 3 files changed, 132 insertions(+), 27 deletions(-) diff --git a/parm/wflow/verify_det.yaml b/parm/wflow/verify_det.yaml index c090ea8b0..13f4c67b7 100644 --- a/parm/wflow/verify_det.yaml +++ b/parm/wflow/verify_det.yaml @@ -23,10 +23,20 @@ default_task_verify_det: &default_task_verify_det metatask_GridStat_APCP_all_accums_all_mems: var: - ACCUM_HH: '{% for ah in verification.VX_APCP_ACCUMS_HRS %}{% if workflow.FCST_LEN_HRS >= ah %}{{ "%02d " % ah }}{% endif %}{% endfor %}' + ACCUM_HH: '{%- for ah in verification.VX_APCP_ACCUMS_HRS %} + {%- if workflow.FCST_LEN_HRS >= ah %} + {{- "%02d " % ah }} + {%- endif %} + {%- endfor %}' metatask_GridStat_APCP#ACCUM_HH#h_all_mems: var: - mem: '{% if global.DO_ENSEMBLE %}{% for m in range(1, global.NUM_ENS_MEMBERS+1) %}{{ "%03d "%m }}{%- endfor -%} {% else %}{{ "000"|string }}{% endif %}' + mem: '{%- if global.DO_ENSEMBLE %} + {%- for m in range(1, global.NUM_ENS_MEMBERS+1) %} + {{- "%03d "%m }} + {%- endfor %} + {%- else %} + {{- "000"|string }} + {%- endif %}' task_run_MET_GridStat_vx_APCP#ACCUM_HH#h_mem#mem#: <<: *default_task_verify_det attrs: @@ -57,10 +67,20 @@ metatask_GridStat_APCP_all_accums_all_mems: metatask_GridStat_ASNOW_all_accums_all_mems: var: - ACCUM_HH: '{% for ah in verification.VX_ASNOW_ACCUMS_HRS %}{% if workflow.FCST_LEN_HRS >= ah %}{{ "%02d " % ah }}{% endif %}{% endfor %}' + ACCUM_HH: '{%- for ah in verification.VX_ASNOW_ACCUMS_HRS %} + {%- if workflow.FCST_LEN_HRS >= ah %} + {{- "%02d " % ah }} + {%- endif %} + {%- endfor %}' metatask_GridStat_ASNOW#ACCUM_HH#h_all_mems: var: - mem: '{% if global.DO_ENSEMBLE %}{% for m in range(1, global.NUM_ENS_MEMBERS+1) %}{{ "%03d "%m }}{%- endfor -%} {% else %}{{ "000"|string }}{% endif %}' + mem: '{%- if global.DO_ENSEMBLE %} + {%- for m in range(1, global.NUM_ENS_MEMBERS+1) %} + {{- "%03d "%m }} + {%- endfor %} + {%- else %} + {{- "000"|string }} + {%- endif %}' task_run_MET_GridStat_vx_ASNOW#ACCUM_HH#h_mem#mem#: <<: *default_task_verify_det attrs: @@ -91,10 +111,20 @@ metatask_GridStat_ASNOW_all_accums_all_mems: metatask_GridStat_REFC_RETOP_all_mems: var: - mem: '{% if global.DO_ENSEMBLE %}{% for m in range(1, global.NUM_ENS_MEMBERS+1) %}{{ "%03d "%m }}{%- endfor -%} {% else %}{{ "000"|string }}{% endif %}' + mem: '{%- if global.DO_ENSEMBLE %} + {%- for m in range(1, global.NUM_ENS_MEMBERS+1) %} + {{- "%03d "%m }} + {%- endfor %} + {%- else %} + {{- "000"|string }} + {%- endif %}' metatask_GridStat_REFC_RETOP_mem#mem#: var: - FIELD_GROUP: '{% for var in verification.VX_FIELD_GROUPS %}{% if var in ["REFC", "RETOP"] %}{{ "%s " % var }}{% endif %}{% endfor %}' + FIELD_GROUP: '{%- for var in verification.VX_FIELD_GROUPS %} + {%- if var in ["REFC", "RETOP"] %} + {{- "%s " % var }} + {%- endif %} + {%- endfor %}' task_run_MET_GridStat_vx_#FIELD_GROUP#_mem#mem#: <<: *default_task_verify_det command: '&LOAD_MODULES_RUN_TASK; "run_vx" "&JOBSdir;/JREGIONAL_RUN_MET_GRIDSTAT_OR_POINTSTAT_VX"' @@ -138,10 +168,20 @@ metatask_GridStat_REFC_RETOP_all_mems: metatask_PointStat_SFC_UPA_all_mems: var: - mem: '{% if global.DO_ENSEMBLE %}{% for m in range(1, global.NUM_ENS_MEMBERS+1) %}{{ "%03d "%m }}{%- endfor -%} {% else %}{{ "000"|string }}{% endif %}' + mem: '{%- if global.DO_ENSEMBLE %} + {%- for m in range(1, global.NUM_ENS_MEMBERS+1) %} + {{- "%03d "%m }} + {%- endfor %} + {%- else %} + {{- "000"|string }} + {%- endif %}' metatask_PointStat_SFC_UPA_mem#mem#: var: - FIELD_GROUP: '{% for var in verification.VX_FIELD_GROUPS %}{% if var in ["SFC", "UPA"] %}{{ "%s " % var }}{% endif %}{% endfor %}' + FIELD_GROUP: '{%- for var in verification.VX_FIELD_GROUPS %} + {%- if var in ["SFC", "UPA"] %} + {{- "%s " % var }} + {%- endif %} + {%- endfor %}' task_run_MET_PointStat_vx_#FIELD_GROUP#_mem#mem#: <<: *default_task_verify_det command: '&LOAD_MODULES_RUN_TASK; "run_vx" "&JOBSdir;/JREGIONAL_RUN_MET_GRIDSTAT_OR_POINTSTAT_VX"' diff --git a/parm/wflow/verify_ens.yaml b/parm/wflow/verify_ens.yaml index d3601c14d..56045cc72 100644 --- a/parm/wflow/verify_ens.yaml +++ b/parm/wflow/verify_ens.yaml @@ -23,7 +23,11 @@ default_task_verify_ens: &default_task_verify_ens metatask_GenEnsProd_EnsembleStat_APCP_all_accums: var: - ACCUM_HH: '{% for ah in verification.VX_APCP_ACCUMS_HRS %}{% if workflow.FCST_LEN_HRS >= ah %}{{ "%02d " % ah }}{% endif %}{% endfor %}' + ACCUM_HH: '{%- for ah in verification.VX_APCP_ACCUMS_HRS %} + {%- if workflow.FCST_LEN_HRS >= ah %} + {{- "%02d " % ah }} + {%- endif %} + {%- endfor %}' task_run_MET_GenEnsProd_vx_APCP#ACCUM_HH#h: &task_GenEnsProd_CCPA <<: *default_task_verify_ens command: '&LOAD_MODULES_RUN_TASK; "run_vx" "&JOBSdir;/JREGIONAL_RUN_MET_GENENSPROD_OR_ENSEMBLESTAT"' @@ -57,7 +61,11 @@ metatask_GenEnsProd_EnsembleStat_APCP_all_accums: metatask_GenEnsProd_EnsembleStat_ASNOW_all_accums: var: - ACCUM_HH: '{% for ah in verification.VX_ASNOW_ACCUMS_HRS %}{% if workflow.FCST_LEN_HRS >= ah %}{{ "%02d " % ah }}{% endif %}{% endfor %}' + ACCUM_HH: '{%- for ah in verification.VX_ASNOW_ACCUMS_HRS %} + {%- if workflow.FCST_LEN_HRS >= ah %} + {{- "%02d " % ah }} + {%- endif %} + {%- endfor %}' task_run_MET_GenEnsProd_vx_ASNOW#ACCUM_HH#h: &task_GenEnsProd_NOHRSC <<: *default_task_verify_ens command: '&LOAD_MODULES_RUN_TASK; "run_vx" "&JOBSdir;/JREGIONAL_RUN_MET_GENENSPROD_OR_ENSEMBLESTAT"' @@ -92,7 +100,11 @@ metatask_GenEnsProd_EnsembleStat_ASNOW_all_accums: metatask_GenEnsProd_EnsembleStat_REFC_RETOP: var: - FIELD_GROUP: '{% for var in verification.VX_FIELD_GROUPS %}{% if var in ["REFC", "RETOP"] %}{{ "%s " % var }}{% endif %}{% endfor %}' + FIELD_GROUP: '{%- for var in verification.VX_FIELD_GROUPS %} + {%- if var in ["REFC", "RETOP"] %} + {{- "%s " % var }} + {%- endif %} + {%- endfor %}' task_run_MET_GenEnsProd_vx_#FIELD_GROUP#: &task_GenEnsProd_MRMS <<: *default_task_verify_ens command: '&LOAD_MODULES_RUN_TASK; "run_vx" "&JOBSdir;/JREGIONAL_RUN_MET_GENENSPROD_OR_ENSEMBLESTAT"' @@ -106,10 +118,9 @@ metatask_GenEnsProd_EnsembleStat_REFC_RETOP: FCST_LEVEL: 'L0' FCST_THRESH: 'all' dependency: - and: - metataskdep_check_post_output: &check_post_output - attrs: - metatask: check_post_output_all_mems + metataskdep_check_post_output: &check_post_output + attrs: + metatask: check_post_output_all_mems task_run_MET_EnsembleStat_vx_#FIELD_GROUP#: <<: *task_GenEnsProd_MRMS envars: @@ -144,7 +155,11 @@ metatask_GenEnsProd_EnsembleStat_REFC_RETOP: metatask_GenEnsProd_EnsembleStat_SFC_UPA: var: - FIELD_GROUP: '{% for var in verification.VX_FIELD_GROUPS %}{% if var in ["SFC", "UPA"] %}{{ "%s " % var }}{% endif %}{% endfor %}' + FIELD_GROUP: '{%- for var in verification.VX_FIELD_GROUPS %} + {%- if var in ["SFC", "UPA"] %} + {{- "%s " % var }} + {%- endif %} + {%- endfor %}' task_run_MET_GenEnsProd_vx_#FIELD_GROUP#: &task_GenEnsProd_NDAS <<: *default_task_verify_ens command: '&LOAD_MODULES_RUN_TASK; "run_vx" "&JOBSdir;/JREGIONAL_RUN_MET_GENENSPROD_OR_ENSEMBLESTAT"' @@ -198,7 +213,11 @@ metatask_GridStat_APCP_all_accums_ensmeanprob: statlc: mean prob metatask_GridStat_APCP_all_accums_ens#statlc#: var: - ACCUM_HH: '{% for ah in verification.VX_APCP_ACCUMS_HRS %}{% if workflow.FCST_LEN_HRS >= ah %}{{ "%02d " % ah }}{% endif %}{% endfor %}' + ACCUM_HH: '{%- for ah in verification.VX_APCP_ACCUMS_HRS %} + {%- if workflow.FCST_LEN_HRS >= ah %} + {{- "%02d " % ah }} + {%- endif %} + {%- endfor %}' task_run_MET_GridStat_vx_APCP#ACCUM_HH#h_ens#statlc#: <<: *default_task_verify_ens command: '&LOAD_MODULES_RUN_TASK; "run_vx" "&JOBSdir;/JREGIONAL_RUN_MET_GRIDSTAT_OR_POINTSTAT_VX_ENS#stat#"' @@ -225,7 +244,11 @@ metatask_GridStat_ASNOW_all_accums_ensmeanprob: statlc: mean prob metatask_GridStat_ASNOW_all_accums_ens#statlc#: var: - ACCUM_HH: '{% for ah in verification.VX_ASNOW_ACCUMS_HRS %}{% if workflow.FCST_LEN_HRS >= ah %}{{ "%02d " % ah }}{% endif %}{% endfor %}' + ACCUM_HH: '{%- for ah in verification.VX_ASNOW_ACCUMS_HRS %} + {%- if workflow.FCST_LEN_HRS >= ah %} + {{- "%02d " % ah }} + {%- endif %} + {%- endfor %}' task_run_MET_GridStat_vx_ASNOW#ACCUM_HH#h_ens#statlc#: <<: *default_task_verify_ens command: '&LOAD_MODULES_RUN_TASK; "run_vx" "&JOBSdir;/JREGIONAL_RUN_MET_GRIDSTAT_OR_POINTSTAT_VX_ENS#stat#"' @@ -248,7 +271,11 @@ metatask_GridStat_ASNOW_all_accums_ensmeanprob: metatask_GridStat_REFC_RETOP_ensprob: var: - FIELD_GROUP: '{% for var in verification.VX_FIELD_GROUPS %}{% if var in ["REFC", "RETOP"] %}{{ "%s " % var }}{% endif %}{% endfor %}' + FIELD_GROUP: '{%- for var in verification.VX_FIELD_GROUPS %} + {%- if var in ["REFC", "RETOP"] %} + {{- "%s " % var }} + {%- endif %} + {%- endfor %}' task_run_MET_GridStat_vx_#FIELD_GROUP#_ensprob: <<: *default_task_verify_ens command: '&LOAD_MODULES_RUN_TASK; "run_vx" "&JOBSdir;/JREGIONAL_RUN_MET_GRIDSTAT_OR_POINTSTAT_VX_ENSPROB"' @@ -275,7 +302,11 @@ metatask_PointStat_SFC_UPA_ensmeanprob: statlc: mean prob metatask_PointStat_SFC_UPA_ens#statlc#: var: - FIELD_GROUP: '{% for var in verification.VX_FIELD_GROUPS %}{% if var in ["SFC", "UPA"] %}{{ "%s " % var }}{% endif %}{% endfor %}' + FIELD_GROUP: '{%- for var in verification.VX_FIELD_GROUPS %} + {%- if var in ["SFC", "UPA"] %} + {{- "%s " % var }} + {%- endif %} + {%- endfor %}' task_run_MET_PointStat_vx_#FIELD_GROUP#_ens#statlc#: <<: *default_task_verify_ens command: '&LOAD_MODULES_RUN_TASK; "run_vx" "&JOBSdir;/JREGIONAL_RUN_MET_GRIDSTAT_OR_POINTSTAT_VX_ENS#stat#"' diff --git a/parm/wflow/verify_pre.yaml b/parm/wflow/verify_pre.yaml index 2b8677256..dad9518af 100644 --- a/parm/wflow/verify_pre.yaml +++ b/parm/wflow/verify_pre.yaml @@ -100,7 +100,11 @@ task_run_MET_Pb2nc_obs_NDAS: metatask_PcpCombine_APCP_all_accums_obs_CCPA: var: - ACCUM_HH: '{% for ah in verification.VX_APCP_ACCUMS_HRS %}{% if workflow.FCST_LEN_HRS >= ah %}{{ "%02d " % ah }}{% endif %}{% endfor %}' + ACCUM_HH: '{%- for ah in verification.VX_APCP_ACCUMS_HRS %} + {%- if workflow.FCST_LEN_HRS >= ah %} + {{- "%02d " % ah }} + {%- endif %} + {%- endfor %}' task_run_MET_PcpCombine_APCP#ACCUM_HH#h_obs_CCPA: <<: *default_task_verify_pre attrs: @@ -142,7 +146,11 @@ metatask_PcpCombine_APCP_all_accums_obs_CCPA: metatask_PcpCombine_ASNOW_all_accums_obs_NOHRSC: var: - ACCUM_HH: '{% for ah in verification.VX_ASNOW_ACCUMS_HRS %}{% if workflow.FCST_LEN_HRS >= ah %}{{ "%02d " % ah }}{% endif %}{% endfor %}' + ACCUM_HH: '{%- for ah in verification.VX_ASNOW_ACCUMS_HRS %} + {%- if workflow.FCST_LEN_HRS >= ah %} + {{- "%02d " % ah }} + {%- endif %} + {%- endfor %}' task_run_MET_PcpCombine_ASNOW#ACCUM_HH#h_obs_NOHRSC: <<: *default_task_verify_pre attrs: @@ -184,7 +192,13 @@ metatask_PcpCombine_ASNOW_all_accums_obs_NOHRSC: metatask_check_post_output_all_mems: var: - mem: '{% if global.DO_ENSEMBLE %}{% for m in range(1, global.NUM_ENS_MEMBERS+1) %}{{ "%03d "%m }}{%- endfor -%} {% else %}{{ "000"|string }}{% endif %}' + mem: '{%- if global.DO_ENSEMBLE %} + {%- for m in range(1, global.NUM_ENS_MEMBERS+1) %} + {{- "%03d "%m }} + {%- endfor %} + {%- else %} + {{- "000"|string }} + {%- endif %}' task_check_post_output_mem#mem#: <<: *default_task_verify_pre attrs: @@ -268,10 +282,20 @@ metatask_check_post_output_all_mems: metatask_PcpCombine_APCP_all_accums_all_mems: var: - ACCUM_HH: '{% for ah in verification.VX_APCP_ACCUMS_HRS %}{% if workflow.FCST_LEN_HRS >= ah %}{{ "%02d " % ah }}{% endif %}{% endfor %}' + ACCUM_HH: '{%- for ah in verification.VX_APCP_ACCUMS_HRS %} + {%- if workflow.FCST_LEN_HRS >= ah %} + {{- "%02d " % ah }} + {%- endif %} + {%- endfor %}' metatask_PcpCombine_APCP#ACCUM_HH#h_all_mems: var: - mem: '{% if global.DO_ENSEMBLE %}{% for m in range(1, global.NUM_ENS_MEMBERS+1) %}{{ "%03d "%m }}{%- endfor -%} {% else %}{{ "000"|string }}{% endif %}' + mem: '{%- if global.DO_ENSEMBLE %} + {%- for m in range(1, global.NUM_ENS_MEMBERS+1) %} + {{- "%03d "%m }} + {%- endfor %} + {%- else %} + {{- "000"|string }} + {%- endif %}' task_run_MET_PcpCombine_APCP#ACCUM_HH#h_fcst_mem#mem#: <<: *default_task_verify_pre attrs: @@ -296,10 +320,20 @@ metatask_PcpCombine_APCP_all_accums_all_mems: metatask_PcpCombine_ASNOW_all_accums_all_mems: var: - ACCUM_HH: '{% for ah in verification.VX_ASNOW_ACCUMS_HRS %}{% if workflow.FCST_LEN_HRS >= ah %}{{ "%02d " % ah }}{% endif %}{% endfor %}' + ACCUM_HH: '{%- for ah in verification.VX_ASNOW_ACCUMS_HRS %} + {%- if workflow.FCST_LEN_HRS >= ah %} + {{- "%02d " % ah }} + {%- endif %} + {%- endfor %}' metatask_PcpCombine_ASNOW#ACCUM_HH#h_all_mems: var: - mem: '{% if global.DO_ENSEMBLE %}{% for m in range(1, global.NUM_ENS_MEMBERS+1) %}{{ "%03d "%m }}{%- endfor -%} {% else %}{{ "000"|string }}{% endif %}' + mem: '{%- if global.DO_ENSEMBLE %} + {%- for m in range(1, global.NUM_ENS_MEMBERS+1) %} + {{- "%03d "%m }} + {%- endfor %} + {%- else %} + {{- "000"|string }} + {%- endif %}' task_run_MET_PcpCombine_ASNOW#ACCUM_HH#h_fcst_mem#mem#: <<: *default_task_verify_pre attrs: