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

Fixing ctest for paramtype and avoid mars.paramtype array for type chemical

This commit is contained in:
Robert Osinski 2024-08-06 10:33:46 +00:00
parent 3ad3fe852e
commit 9f8c872a4e
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
definitions/grib2/template.4.optical.def
View File

@ -7,9 +7,10 @@ if (wavelength_param_split == 1 && chem_param_split == 0){
} }
if (chem_param_split == 1 && wavelength_param_split == 1){ if (chem_param_split == 1 && wavelength_param_split == 1){
constant paramTypeChemical = "chemical_optical" ; # use paramTypeChemical2 to avoid creating an array for mars.paramtype as paramTypeChemical is defined in template.4.{aerosol,chemical}.def
constant paramTypeChemical2 = "chemical_optical" ;
unalias mars.paramtype; unalias mars.paramtype;
alias mars.paramtype = paramTypeChemical ; alias mars.paramtype = paramTypeChemical2 ;
} }
codetable[1] typeOfWavelengthInterval ('4.91.table',masterDir,localDir) : dump; codetable[1] typeOfWavelengthInterval ('4.91.table',masterDir,localDir) : dump;

11
tests/grib2_paramType.sh
View File

@ -45,11 +45,18 @@ check_param_type_is_scalar $tempGrib 'base'
# Optical properties of aerosol # Optical properties of aerosol
# without wavelength key
${tools_dir}/grib_set -s productDefinitionTemplateNumber=48,discipline=0,parameterCategory=20,parameterNumber=102 \ ${tools_dir}/grib_set -s productDefinitionTemplateNumber=48,discipline=0,parameterCategory=20,parameterNumber=102 \
$sample $tempGrib $sample $tempGrib
${tools_dir}/grib_dump -O -p section_4 $tempGrib > /dev/null ${tools_dir}/grib_dump -O -p section_4 $tempGrib > /dev/null
grib_check_key_equals $tempGrib mars.paramtype 'optical' grib_check_key_equals $tempGrib mars.paramtype 'base'
check_param_type_is_scalar $tempGrib 'optical' check_param_type_is_scalar $tempGrib 'base'
# with wavelength key
${tools_dir}/grib_set -s tablesVersion=33,productDefinitionTemplateNumber=48,discipline=0,parameterCategory=20,parameterNumber=102 \
$sample $tempGrib
${tools_dir}/grib_dump -O -p section_4 $tempGrib > /dev/null
grib_check_key_equals $tempGrib mars.paramtype 'chemical_optical'
check_param_type_is_scalar $tempGrib 'chemical_optical'
# Generalised tiles # Generalised tiles
${tools_dir}/grib_set -s productDefinitionTemplateNumber=113 $sample $tempGrib ${tools_dir}/grib_set -s productDefinitionTemplateNumber=113 $sample $tempGrib