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

ECC-1691: Fix test re mars.step

This commit is contained in:
Shahram Najm 2023-09-27 10:41:34 +00:00
parent 98659cc99a
commit 6554d0b193
2 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
definitions/grib2/post_meta_data.hook.products_12.def
View File

@ -7,6 +7,7 @@ concept gridSpecification(unknown, "gridSpecificationConcept.def",conceptsDir2,c
concept destineOrigin (unknown, "destineOriginConcept.def",conceptsDir2,conceptsDir1): no_copy, dump;
if(dataset is "climate-dt") {
unalias mars.step;
alias mars.date = validityDate;
alias mars.time = validityTime;
unalias mars.step;

42
tests/grib_ecc-1691.sh
View File

@ -20,57 +20,57 @@ temp_grib_b=temp.$label.b.grib
destine_sample=temp.$label.destine.grib
sample_grib2=$ECCODES_SAMPLES_PATH/GRIB2.tmpl
tablesVersionLatest=$( ${tools_dir}/grib_get -p tablesVersionLatest ${sample_grib2} )
tablesVersionLatest=$( ${tools_dir}/grib_get -p tablesVersionLatest $sample_grib2 )
# Setup Destine pseudo-centre GRIB message
# First latest tables version and add local section with MARS labeling
${tools_dir}/grib_set -s tablesVersion=${tablesVersionLatest},setLocalDefinition=1,grib2LocalSectionNumber=1 ${sample_grib2} ${temp_grib_a}
${tools_dir}/grib_set -s tablesVersion=$tablesVersionLatest,setLocalDefinition=1,grib2LocalSectionNumber=1 $sample_grib2 $temp_grib_a
# Then change to processed data = 12 --> DestinE
${tools_dir}/grib_set -s productionStatusOfProcessedData=12 ${temp_grib_a} ${destine_sample}
${tools_dir}/grib_set -s productionStatusOfProcessedData=12 $temp_grib_a $destine_sample
# Check DestinE base related keys are present and correct
grib_check_key_exists ${destine_sample} destineLocalVersion,dataset,marsClass,marsType,marsStream,experimentVersionNumber
grib_check_key_equals ${destine_sample} "marsClass,dataset,destineLocalVersion" "d1 0 1"
grib_check_key_exists $destine_sample destineLocalVersion,dataset,marsClass,marsType,marsStream,experimentVersionNumber
grib_check_key_equals $destine_sample "marsClass,dataset,destineLocalVersion" "d1 0 1"
# Check setting dataset to climate-dt (1). Check keys are present and equal defaults
${tools_dir}/grib_set -s dataset=1 ${destine_sample} ${temp_grib_a}
${tools_dir}/grib_set -s dataset=1 $destine_sample $temp_grib_a
grib_check_key_exists ${temp_grib_a} dataset,datasetVersion,datasetActivity,datasetExperiment,model
grib_check_key_equals ${temp_grib_a} "dataset,datasetVersion,datasetActivity,datasetExperiment,model" "1 0 0 0 0"
grib_check_key_exists $temp_grib_a dataset,datasetVersion,datasetActivity,datasetExperiment,model
grib_check_key_equals $temp_grib_a "dataset,datasetVersion,datasetActivity,datasetExperiment,model" "1 0 0 0 0"
# Check an example where a few additional things are set in climate-dt
${tools_dir}/grib_set -s dataset=1,datasetVersion=2,datasetActivity=1,datasetExperiment=1,model=2 ${destine_sample} ${temp_grib_a}
${tools_dir}/grib_set -s dataset=1,datasetVersion=2,datasetActivity=1,datasetExperiment=1,model=2 $destine_sample $temp_grib_a
grib_check_key_equals ${temp_grib_a} "dataset,datasetVersion,datasetActivity,datasetExperiment,model" "1 2 1 1 2"
grib_check_key_equals ${temp_grib_a} "dataset:s,datasetVersion:s,datasetActivity:s,datasetExperiment:s,model:s" "climate-dt v20230801 CMIP6 hist IFS-NEMO"
grib_check_key_equals $temp_grib_a "dataset,datasetVersion,datasetActivity,datasetExperiment,model" "1 2 1 1 2"
grib_check_key_equals $temp_grib_a "dataset:s,datasetVersion:s,datasetActivity:s,datasetExperiment:s,model:s" "climate-dt v20230801 CMIP6 hist IFS-NEMO"
# Check mars.date and mars.time are equal to validityDate and validityTime, and that mars.step has been unaliased
result1=$( ${tools_dir}/grib_get -p mars.date,mars.time $temp_grib_a )
result2=$( ${tools_dir}/grib_get -p validityDate,validityTime $temp_grib_a )
[ "$result1" = "$result2" ]
# TODO: mars.step should be unaliased! this test is broken
# [ $( ${tools_dir}/grib_get -f -p mars.step ${temp_grib_a} ) = "not_found" ]
${tools_dir}/grib_ls -jm $temp_grib_a
[ $( ${tools_dir}/grib_get -f -p mars.step $temp_grib_a ) = "not_found" ]
# Check setting dataset to extremes-dt (2). This time we will check string also
${tools_dir}/grib_set -s dataset=2 ${destine_sample} ${temp_grib_a}
${tools_dir}/grib_set -s dataset=2 $destine_sample $temp_grib_a
grib_check_key_equals ${temp_grib_a} "dataset,dataset:s" "2 extremes-dt"
grib_check_key_equals $temp_grib_a "dataset,dataset:s" "2 extremes-dt"
# Check concepts. First check default value and then example of mapping
grib_check_key_exists ${destine_sample} destineOrigin,gridSpecification
grib_check_key_equals ${destine_sample} "destineOrigin,gridSpecification" "unknown unknown"
grib_check_key_exists $destine_sample destineOrigin,gridSpecification
grib_check_key_equals $destine_sample "destineOrigin,gridSpecification" "unknown unknown"
# Below mapping is for MeteoFrance
${tools_dir}/grib_set -s centre=98,subCentre=84 ${destine_sample} ${temp_grib_a}
${tools_dir}/grib_set -s centre=98,subCentre=84 $destine_sample $temp_grib_a
grib_check_key_equals ${temp_grib_a} "destineOrigin" "MeteoFrance"
grib_check_key_equals $temp_grib_a "destineOrigin" "MeteoFrance"
# Below mapping is for H1024
${tools_dir}/grib_set -s numberOfDataPoints=12582912,gridDefinitionTemplateNumber=150,Nside=1024 ${destine_sample} ${temp_grib_a}
${tools_dir}/grib_set -s numberOfDataPoints=12582912,gridDefinitionTemplateNumber=150,Nside=1024 $destine_sample $temp_grib_a
grib_check_key_equals ${temp_grib_a} "gridSpecification" "H1024"
grib_check_key_equals $temp_grib_a "gridSpecification" "H1024"
# Clean up
rm -f $temp_grib_a $temp_grib_b $destine_sample