From 2241d466303b12bbb5fdb27894437f04b73345ed Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Sat, 18 Sep 2021 23:05:00 +0100 Subject: [PATCH] Remove tests for transients is_efas --- tests/grib_efas.sh | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/tests/grib_efas.sh b/tests/grib_efas.sh index 6e2d563d5..4124974ca 100755 --- a/tests/grib_efas.sh +++ b/tests/grib_efas.sh @@ -22,31 +22,28 @@ temp3=temp3.$label.grib # Create a starting GRIB with a basic local definition for MARS ${tools_dir}/grib_set -s tablesVersion=19,setLocalDefinition=1,stream=efas $ECCODES_SAMPLES_PATH/GRIB2.tmpl $sample -# Check is_efas key -grib_check_key_equals $sample is_efas 0 - # Test a non-ensemble, instantaneous field ${tools_dir}/grib_set -s productDefinitionTemplateNumber=0 $sample $temp1 ${tools_dir}/grib_set -s setLocalDefinition=1,localDefinitionNumber=41 $temp1 $temp2 -grib_check_key_equals $temp2 is_efas,productDefinitionTemplateNumber '1 70' +grib_check_key_equals $temp2 productDefinitionTemplateNumber '70' grib_check_key_exists $temp2 isFillup,dateOfForecast,timeOfForecast,anoffset # Test an ensemble, instantaneous field ${tools_dir}/grib_set -s productDefinitionTemplateNumber=1,number=13 $sample $temp1 ${tools_dir}/grib_set -s setLocalDefinition=1,localDefinitionNumber=41 $temp1 $temp2 -grib_check_key_equals $temp2 is_efas,number,productDefinitionTemplateNumber '1 13 71' +grib_check_key_equals $temp2 number,productDefinitionTemplateNumber '13 71' # Test a non-ensemble, non-instantaneous field ${tools_dir}/grib_set -s productDefinitionTemplateNumber=8,stepType=accum $sample $temp1 ${tools_dir}/grib_set -s setLocalDefinition=1,localDefinitionNumber=41 $temp1 $temp2 -grib_check_key_equals $temp2 is_efas,productDefinitionTemplateNumber,typeOfStatisticalProcessing '1 72 1' +grib_check_key_equals $temp2 productDefinitionTemplateNumber,typeOfStatisticalProcessing '72 1' # Test an ensemble, non-instantaneous field (plus mars.origin tests) ${tools_dir}/grib_set -s productDefinitionTemplateNumber=11,stepType=accum $sample $temp1 ${tools_dir}/grib_set -s \ setLocalDefinition=1,localDefinitionNumber=41,type=pf,inputOriginatingCentre=ecmf,typeOfPostProcessing=1 \ $temp1 $temp2 -grib_check_key_equals $temp2 is_efas,productDefinitionTemplateNumber,typeOfStatisticalProcessing '1 73 1' +grib_check_key_equals $temp2 productDefinitionTemplateNumber,typeOfStatisticalProcessing '73 1' grib_check_key_equals $temp2 mars.origin 'ecmf' grib_check_key_equals $temp2 mars.model 'lisflood' @@ -57,10 +54,10 @@ grib_check_key_equals $temp2 mars.model 'geff' # Parameter tests ${tools_dir}/grib_set -s paramId=260267 $temp2 $temp3 -grib_check_key_equals $temp3 paramId,is_efas,lengthOfTimeRange '260267 1 6' +grib_check_key_equals $temp3 paramId,lengthOfTimeRange '260267 6' ${tools_dir}/grib_set -s paramId=260268 $temp2 $temp3 -grib_check_key_equals $temp3 paramId,is_efas,lengthOfTimeRange '260268 1 24' +grib_check_key_equals $temp3 paramId,lengthOfTimeRange '260268 24' # Use stepType ${tools_dir}/grib_set -s localDefinitionNumber=41,stepType=accum $sample $temp1