From e272156c357ddb243b6be6c934dab49c37c33991 Mon Sep 17 00:00:00 2001 From: "Jeff.Beck" Date: Fri, 23 Oct 2020 02:36:07 +0000 Subject: [PATCH 1/3] Add if statement in set_thompson_mp_fix_files.sh to source Thompson climo file when using a combination of a Thompson-based SDF and non-RAP/HRRR external model data --- ush/set_thompson_mp_fix_files.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ush/set_thompson_mp_fix_files.sh b/ush/set_thompson_mp_fix_files.sh index a2bd16c48..b9f9af6d1 100644 --- a/ush/set_thompson_mp_fix_files.sh +++ b/ush/set_thompson_mp_fix_files.sh @@ -123,6 +123,14 @@ string." "qr_acr_qs.dat" \ ) + if [ "${EXTRN_MDL_NAME_ICS}" != "HRRRX" ] && \ + [ "${EXTRN_MDL_NAME_ICS}" != "RAPX" ] && \ + [ "${EXTRN_MDL_NAME_LBCS}" != "HRRRX" ] && \ + [ "${EXTRN_MDL_NAME_LBCS}" != "RAPX" ]; then + thompson_mp_fix_files+=( "Thompson_MP_MONTHLY_CLIMO.nc" ) + fi + + FIXgsm_FILES_TO_COPY_TO_FIXam+=( "${thompson_mp_fix_files[@]}" ) num_files=${#thompson_mp_fix_files[@]} From 41832ae0a85fe3c46c614400ec122c6da130a121 Mon Sep 17 00:00:00 2001 From: "Jeff.Beck" Date: Fri, 23 Oct 2020 19:57:59 +0000 Subject: [PATCH 2/3] Modify if statement based on external models for Thompson climo file --- ush/set_thompson_mp_fix_files.sh | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/ush/set_thompson_mp_fix_files.sh b/ush/set_thompson_mp_fix_files.sh index b9f9af6d1..f9001becb 100644 --- a/ush/set_thompson_mp_fix_files.sh +++ b/ush/set_thompson_mp_fix_files.sh @@ -123,13 +123,10 @@ string." "qr_acr_qs.dat" \ ) - if [ "${EXTRN_MDL_NAME_ICS}" != "HRRRX" ] && \ - [ "${EXTRN_MDL_NAME_ICS}" != "RAPX" ] && \ - [ "${EXTRN_MDL_NAME_LBCS}" != "HRRRX" ] && \ - [ "${EXTRN_MDL_NAME_LBCS}" != "RAPX" ]; then + if [ "${EXTRN_MDL_NAME_ICS}" != "HRRRX" -a "${EXTRN_MDL_NAME_ICS}" != "RAPX" ] || \ + [ "${EXTRN_MDL_NAME_LBCS}" != "HRRRX" -a "${EXTRN_MDL_NAME_LBCS}" != "RAPX" ]; then thompson_mp_fix_files+=( "Thompson_MP_MONTHLY_CLIMO.nc" ) - fi - + fi FIXgsm_FILES_TO_COPY_TO_FIXam+=( "${thompson_mp_fix_files[@]}" ) From 6dad181c1e85851947ede95cfcc0ea311b02a62b Mon Sep 17 00:00:00 2001 From: "Jeff.Beck" Date: Fri, 23 Oct 2020 21:29:07 +0000 Subject: [PATCH 3/3] Modify if statement to correctly stage Thompson MP climo file. --- ush/set_thompson_mp_fix_files.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ush/set_thompson_mp_fix_files.sh b/ush/set_thompson_mp_fix_files.sh index f9001becb..821f763da 100644 --- a/ush/set_thompson_mp_fix_files.sh +++ b/ush/set_thompson_mp_fix_files.sh @@ -122,10 +122,13 @@ string." "qr_acr_qg.dat" \ "qr_acr_qs.dat" \ ) + if [ "${EXTRN_MDL_NAME_ICS}" != "HRRRX" -a "${EXTRN_MDL_NAME_ICS}" != "RAPX" ] || \ [ "${EXTRN_MDL_NAME_LBCS}" != "HRRRX" -a "${EXTRN_MDL_NAME_LBCS}" != "RAPX" ]; then + thompson_mp_fix_files+=( "Thompson_MP_MONTHLY_CLIMO.nc" ) + fi FIXgsm_FILES_TO_COPY_TO_FIXam+=( "${thompson_mp_fix_files[@]}" )