From 02b092a45f600e37d5823f24ba7d99196d47d081 Mon Sep 17 00:00:00 2001 From: David Grumm Date: Thu, 20 Mar 2025 23:44:08 +0000 Subject: [PATCH 1/2] Wrapped code that copies analysis fv_tracer files in check for value of DO_AERO_ANL --- ush/forecast_postdet.sh | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/ush/forecast_postdet.sh b/ush/forecast_postdet.sh index 19028bb5f8c..661b597b771 100755 --- a/ush/forecast_postdet.sh +++ b/ush/forecast_postdet.sh @@ -72,24 +72,29 @@ FV3_postdet() { break fi done - # Replace fv_tracer with aeroanl_fv_tracer restart files from current cycle (if found) - local nn - local use_anl_aero="YES" - for (( nn = 1; nn <= ntiles; nn++ )); do - test_tracer_file="${COMOUT_ATMOS_RESTART}/${restart_date:0:8}.${restart_date:8:2}0000.aeroanl_fv_tracer.res.tile${nn}.nc" - if [[ ! -f "${test_tracer_file}" ]]; then - use_anl_aero="NO" - echo "WARNING: File ${test_tracer_file} does not exist, will not replace any files from the aerosol analysis" - break - fi - done - if [[ ${use_anl_aero} == "YES" ]]; then + # If aerosol analysis is to be done, replace fv_tracer with aeroanl_fv_tracer + # restart files from current cycle (if found) + if [[ ${DO_AERO_ANL} == "YES" ]]; then + local nn + local use_anl_aero="YES" for (( nn = 1; nn <= ntiles; nn++ )); do - rm -f "${DATA}/INPUT/fv_tracer.res.tile${nn}.nc" - ${NCP} "${COMOUT_ATMOS_RESTART}/${restart_date:0:8}.${restart_date:8:2}0000.aeroanl_fv_tracer.res.tile${nn}.nc" \ - "${DATA}/INPUT/fv_tracer.res.tile${nn}.nc" + test_tracer_file="${COMOUT_ATMOS_RESTART}/${restart_date:0:8}.${restart_date:8:2}0000.aeroanl_fv_tracer.res.tile${nn}.nc" + if [[ ! -f "${test_tracer_file}" ]]; then + use_anl_aero="NO" + echo "WARNING: File ${test_tracer_file} does not exist, will not replace any files from the aerosol analysis" + break + fi done - fi # if [[ ${use_anl_aero} == "YES" ]]; then + if [[ ${use_anl_aero} == "YES" ]]; then + for (( nn = 1; nn <= ntiles; nn++ )); do + rm -f "${DATA}/INPUT/fv_tracer.res.tile${nn}.nc" + ${NCP} "${COMOUT_ATMOS_RESTART}/${restart_date:0:8}.${restart_date:8:2}0000.aeroanl_fv_tracer.res.tile${nn}.nc" \ + "${DATA}/INPUT/fv_tracer.res.tile${nn}.nc" + done + fi # if [[ ${use_anl_aero} == "YES" ]]; then + + fi # [[ ${DO_AERO_ANL} == "YES" ]]; then + fi # if [[ "${RERUN}" == "YES" ]]; then fi # if [[ "${warm_start}" == ".true." ]]; then From a3d80c55baa5ddac636b8c4c21ac60b2a2f60636 Mon Sep 17 00:00:00 2001 From: David Grumm Date: Thu, 27 Mar 2025 04:04:03 +0000 Subject: [PATCH 2/2] Switch flag to DO_AERO_FCST --- ush/forecast_postdet.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ush/forecast_postdet.sh b/ush/forecast_postdet.sh index 661b597b771..b6e69d00a4a 100755 --- a/ush/forecast_postdet.sh +++ b/ush/forecast_postdet.sh @@ -74,7 +74,7 @@ FV3_postdet() { done # If aerosol analysis is to be done, replace fv_tracer with aeroanl_fv_tracer # restart files from current cycle (if found) - if [[ ${DO_AERO_ANL} == "YES" ]]; then + if [[ ${DO_AERO_FCST} == "YES" ]]; then local nn local use_anl_aero="YES" for (( nn = 1; nn <= ntiles; nn++ )); do @@ -93,7 +93,7 @@ FV3_postdet() { done fi # if [[ ${use_anl_aero} == "YES" ]]; then - fi # [[ ${DO_AERO_ANL} == "YES" ]]; then + fi # [[ ${DO_AERO_FCST} == "YES" ]]; then fi # if [[ "${RERUN}" == "YES" ]]; then