From d3028b9d8268028226f9c27800fcd6655e9e4bb8 Mon Sep 17 00:00:00 2001 From: David Huber <69919478+DavidHuber-NOAA@users.noreply.github.com> Date: Wed, 19 Jan 2022 14:29:51 -0500 Subject: [PATCH] Fix setting of OUTPUT_FILETYPES (#589) The setting of OUTPUT_FILETYPES was being overwritten by the FV3 model configure parsing script, so the settings determined in the config.fcst file was being ignored. Now that block is removed and config.fcst is updated to make sure it is set for any machine. Fixes #588 --- parm/config/config.fcst | 11 +++-------- ush/parsing_model_configure_FV3.sh | 5 ----- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/parm/config/config.fcst b/parm/config/config.fcst index 30796ee77c..1a246ba999 100755 --- a/parm/config/config.fcst +++ b/parm/config/config.fcst @@ -205,6 +205,7 @@ export deflate_level=1 export OUTPUT_FILETYPES="$OUTPUT_FILE" if [[ "$OUTPUT_FILE" == "netcdf" ]]; then + export OUTPUT_FILETYPES=" 'netcdf_parallel' 'netcdf' " export ichunk2d=0; export jchunk2d=0 export ichunk3d=0; export jchunk3d=0; export kchunk3d=0 RESTILE=$(echo $CASE |cut -c 2-) @@ -214,17 +215,11 @@ if [[ "$OUTPUT_FILE" == "netcdf" ]]; then export ichunk3d=$((4*RESTILE)) export jchunk3d=$((2*RESTILE)) export kchunk3d=1 - else - export OUTPUT_FILETYPES=" 'netcdf_parallel' 'netcdf' " fi fi - if [[ "$machine" == "HERA" ]]; then - export OUTPUT_FILETYPES=" 'netcdf_parallel' 'netcdf' " - fi if [[ "$machine" == "ORION" ]]; then - export OUTPUT_FILETYPES=" 'netcdf_parallel' 'netcdf_parallel' " - if [ $RESTILE -le 192 ]; then - export OUTPUT_FILETYPES=" 'netcdf_parallel' 'netcdf' " + if [ $RESTILE -gt 192 ]; then + export OUTPUT_FILETYPES=" 'netcdf_parallel' 'netcdf_parallel' " fi fi fi diff --git a/ush/parsing_model_configure_FV3.sh b/ush/parsing_model_configure_FV3.sh index 71a5f2394d..0a43589a7a 100755 --- a/ush/parsing_model_configure_FV3.sh +++ b/ush/parsing_model_configure_FV3.sh @@ -12,11 +12,6 @@ FV3_model_configure(){ -export OUTPUT_FILETYPES="$OUTPUT_FILE" -if [[ "$OUTPUT_FILE" == "netcdf" ]]; then - export OUTPUT_FILETYPES=" 'netcdf_parallel' 'netcdf' " -fi - rm -f model_configure cat >> model_configure <