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

Merge branch 'ecmwf:develop' into feature/destine-layout

This commit is contained in:
Matthew Griffith 2023-08-11 14:38:51 +01:00 committed by GitHub
parent 0f1ba8f64d a7f2d559ea
commit 47d3667ac2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
definitions/grib1/section.1.def
View File

@ -246,6 +246,7 @@ if (centre == 34 && subCentre == 241)
meta time.validityDate validity_date(dataDate,dataTime,step,stepUnits);
meta time.validityTime validity_time(dataDate,dataTime,step,stepUnits);
meta validityDateTime julian_date(validityDate, validityTime) : no_copy;
transient deleteLocalDefinition=0;

1
definitions/grib2/template.4.point_in_time.def
View File

@ -28,4 +28,5 @@ alias time.endStep=endStep;
meta time.validityDate validity_date(dataDate,dataTime,step,stepUnits) : no_copy;
meta time.validityTime validity_time(dataDate,dataTime,step,stepUnits) : no_copy;
meta validityDateTime julian_date(validityDate, validityTime) : no_copy;

1
definitions/grib2/template.4.statistical.def
View File

@ -125,3 +125,4 @@ meta time.validityDate validity_date(date,dataTime,step,stepUnits,yearOfEndOfOve
monthOfEndOfOverallTimeInterval,dayOfEndOfOverallTimeInterval) : no_copy;
meta time.validityTime validity_time(date,dataTime,step,stepUnits,hourOfEndOfOverallTimeInterval,
minuteOfEndOfOverallTimeInterval) : no_copy;
meta validityDateTime julian_date(validityDate, validityTime) : no_copy;

18
tests/grib_change_packing.sh
View File

@ -136,6 +136,13 @@ if [ $HAVE_AEC -eq 0 ]; then
grep -q "CCSDS support not enabled. Please rebuild with -DENABLE_AEC=ON" $temp_err
fi
# grid_simple_log_preprocessing
# -----------------------------
input=${data_dir}/sample.grib2
${tools_dir}/grib_set -r -s packingType=grid_simple_log_preprocessing $input $temp
grib_check_key_equals $temp packingType 'grid_simple_log_preprocessing'
${tools_dir}/grib_compare -c data:n -R packedValues=2e-6 $input $temp
# Large constant fields
# -----------------------
input=${data_dir}/sample.grib2
@ -168,5 +175,16 @@ set -e
grep -q "ECCODES ERROR.*no match for packingType=xxxxx" $temp_err
cat $temp_err
# Set packingType when it is disabled
# -----------------------------------
if [ $HAVE_PNG -eq 0 ]; then
set +e
${tools_dir}/grib_set -s packingType=grid_png $ECCODES_SAMPLES_PATH/GRIB2.tmpl $temp > $temp_err 2>&1
status=$?
set -e
[ $status -ne 0 ]
grep -q "ECCODES ERROR.*PNG support not enabled" $temp_err
fi
# Clean up
rm -f $temp $temp_err

7
tests/grib_jpeg.sh
View File

@ -124,4 +124,11 @@ stats=`${tools_dir}/grib_get -M -F%.2f -p min,max $tempGrib`
[ "$stats" = "-0.01 98.99" ]
# Constant field
${tools_dir}/grib_set -d1 ${data_dir}/jpeg.grib2 $tempGrib
grib_check_key_equals $tempGrib isConstant 1
${tools_dir}/grib_ls -n statistics $tempGrib
# Clean up
rm -f $tempFilt $tempGrib

15
tests/grib_step.sh
View File

@ -140,6 +140,21 @@ grib_check_key_equals $temp "stepRange,startStep,endStep" "24 24 24"
${tools_dir}/grib_set -s stepRange:d=14.56 $grib2_sample $temp
grib_check_key_equals $temp "stepRange,startStep,endStep" "14 14 14"
# Key validityDateTime
# -----------------------------------------------
input=${data_dir}/constant_field.grib2
grib_check_key_equals $input "dataDate,dataTime,step" "20061205 1200 6"
grib_check_key_equals $input "validityDate,validityTime" "20061205 1800"
grib_check_key_equals $input "validityDateTime:s" "20061205 001800"
# Key julianDay
# -----------------------------------------------
input=${data_dir}/sample.grib2
grib_check_key_equals $input 'julianDay:i' '2454503'
${tools_dir}/grib_set -s julianDay=2454504 $input $temp
grib_check_key_equals $input day 6
grib_check_key_equals $temp day 7
# Clean up
rm -f $temp