core
/
eccodes
mirror of https://github.com/ecmwf/eccodes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ECC-1183: Fix issue re setting keys separately

This commit is contained in:
Shahram Najm 2021-01-07 15:20:00 +00:00
parent 23a077fb77
commit aa74d827ae
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
definitions/grib2/localConcepts/ecmf/unstructuredGrid.def
View File

@ -7,8 +7,8 @@ concept unstructuredGridSubtype(unknown,"unstructuredGridSubtype.def",conceptsLo
concept unstructuredGridUUID(unknown,"unstructuredGridUUID.def",conceptsLocalDirAll,conceptsMasterDir);
if (unstructuredGridType is "undefined" || unstructuredGridType is "unknown") {
meta gridName sprintf("%s",unstructuredGridType);
meta gridName sprintf("%s",unstructuredGridType) : no_copy;
} else {
meta gridName sprintf("%s_%s",unstructuredGridType,unstructuredGridSubtype);
meta gridName sprintf("%s_%s",unstructuredGridType,unstructuredGridSubtype) : no_copy;
}
alias ls.gridName=gridName;

4
tests/grib_grid_unstructured.sh
View File

@ -25,6 +25,10 @@ grib_check_key_equals $temp1 gridName 'undefined'
${tools_dir}/grib_set -s gridType=unstructured_grid,numberOfGridInReference=94,numberOfGridUsed=200 $sample $temp1
grib_check_key_equals $temp1 gridName 'unknown'
# Two invocations of grib_set
${tools_dir}/grib_set -s gridType=unstructured_grid $sample $temp1
${tools_dir}/grib_set -s unstructuredGridType=ORCA1 $temp1 $temp2
# ORCA1, W grid
${tools_dir}/grib_set -s gridType=unstructured_grid,numberOfGridInReference=4,numberOfGridUsed=2 $sample $temp1
grib_check_key_equals $temp1 'unstructuredGridType' 'ORCA1'