Skip to content

Commit

Permalink
Fix setting of OUTPUT_FILETYPES (NOAA-EMC#589)
Browse files Browse the repository at this point in the history
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 NOAA-EMC#588
  • Loading branch information
DavidHuber-NOAA authored Jan 19, 2022
1 parent 13421b0 commit d3028b9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 13 deletions.
11 changes: 3 additions & 8 deletions parm/config/config.fcst
Original file line number Diff line number Diff line change
Expand Up @@ -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-)
Expand All @@ -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
Expand Down
5 changes: 0 additions & 5 deletions ush/parsing_model_configure_FV3.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 <<EOF
print_esmf: ${print_esmf:-.true.}
Expand Down

0 comments on commit d3028b9

Please sign in to comment.