From aa74d827aec2be870196a1c17d9a6a90e7524e91 Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Thu, 7 Jan 2021 15:20:00 +0000 Subject: [PATCH] ECC-1183: Fix issue re setting keys separately --- definitions/grib2/localConcepts/ecmf/unstructuredGrid.def | 4 ++-- tests/grib_grid_unstructured.sh | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/definitions/grib2/localConcepts/ecmf/unstructuredGrid.def b/definitions/grib2/localConcepts/ecmf/unstructuredGrid.def index c5c156595..80b668b40 100644 --- a/definitions/grib2/localConcepts/ecmf/unstructuredGrid.def +++ b/definitions/grib2/localConcepts/ecmf/unstructuredGrid.def @@ -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; diff --git a/tests/grib_grid_unstructured.sh b/tests/grib_grid_unstructured.sh index 5353ef05d..1862f93ef 100755 --- a/tests/grib_grid_unstructured.sh +++ b/tests/grib_grid_unstructured.sh @@ -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'