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

ECC-1485: Definitions: Split the statistics from missing-values templates

This commit is contained in:
Shahram Najm 2022-12-01 20:06:08 +00:00
parent 90fbcd6abd
commit fd037b179a
22 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
definitions/common/missing_values_grid.def Normal file
View File

@ -0,0 +1,5 @@
# (C) Copyright 2005- ECMWF.
#meta numberOfMissing vector(computeStatistics,3) : dump;
meta numberOfMissing count_missing(bitmap,unusedBitsInBitmap,numberOfDataPoints) : dump;
alias numberOfMissingValues=numberOfMissing;

4
definitions/common/statistics_grid.def
View File

@ -8,15 +8,11 @@ meta computeStatistics statistics(missingValue,values);
meta maximum vector(computeStatistics,0) : dump;
meta minimum vector(computeStatistics,1) : dump;
meta average vector(computeStatistics,2) : dump;
#meta numberOfMissing vector(computeStatistics,3) : dump;
meta numberOfMissing count_missing(bitmap,unusedBitsInBitmap,numberOfDataPoints) : dump;
meta standardDeviation vector(computeStatistics,4) : dump;
meta skewness vector(computeStatistics,5) : dump;
meta kurtosis vector(computeStatistics,6) : dump;
meta isConstant vector(computeStatistics,7) : dump;
alias numberOfMissingValues=numberOfMissing;
alias statistics.avg = average;
alias statistics.max = maximum;
alias statistics.min = minimum;

1
definitions/grib1/data.grid_ieee.def
View File

@ -43,3 +43,4 @@ if( bitmapPresent || !GDSPresent ) {
meta numberOfCodedValues number_of_values_data_raw_packing(values,precision);
template statistics "common/statistics_grid.def";
template missing_values "common/missing_values_grid.def";

1
definitions/grib1/data.grid_second_order.def
View File

@ -174,3 +174,4 @@ if(bitmapPresent) {
meta packingError simple_packing_error(bitsPerValue,binaryScaleFactor,decimalScaleFactor,referenceValue,ibm) : no_copy;
template statistics "common/statistics_grid.def";
template missing_values "common/missing_values_grid.def";

1
definitions/grib1/data.grid_second_order_constant_width.def
View File

@ -148,3 +148,4 @@ transient numberOfCodedValues = numberOfSecondOrderPackedValues;
meta packingError simple_packing_error(bitsPerValue,binaryScaleFactor,decimalScaleFactor,referenceValue,ibm) : no_copy;
template statistics "common/statistics_grid.def";
template missing_values "common/missing_values_grid.def";

1
definitions/grib1/data.grid_second_order_general_grib1.def
View File

@ -147,3 +147,4 @@ transient numberOfCodedValues = numberOfSecondOrderPackedValues;
meta packingError simple_packing_error(bitsPerValue,binaryScaleFactor,decimalScaleFactor,referenceValue,ibm) : no_copy;
template statistics "common/statistics_grid.def";
template missing_values "common/missing_values_grid.def";

1
definitions/grib1/data.grid_second_order_row_by_row.def
View File

@ -94,3 +94,4 @@ transient numberOfCodedValues = numberOfSecondOrderPackedValues;
meta packingError simple_packing_error(bitsPerValue,binaryScaleFactor,decimalScaleFactor,referenceValue,ibm) : no_copy;
template statistics "common/statistics_grid.def";
template missing_values "common/missing_values_grid.def";

1
definitions/grib1/data.grid_simple.def
View File

@ -68,3 +68,4 @@ meta numberOfCodedValues number_of_coded_values(bitsPerValue,offsetBeforeData,of
meta packingError simple_packing_error(bitsPerValue,binaryScaleFactor,decimalScaleFactor,referenceValue,ibm) : no_copy;
meta unpackedError simple_packing_error(zero,binaryScaleFactor,decimalScaleFactor,referenceValue,ieee) : no_copy;
template statistics "common/statistics_grid.def";
template missing_values "common/missing_values_grid.def";

1
definitions/grib1/data.grid_simple_matrix.def
View File

@ -177,3 +177,4 @@ meta packingError simple_packing_error(bitsPerValue,binaryScaleFactor,decimalSca
meta numberOfCodedValues number_of_coded_values(bitsPerValue,offsetBeforeData,offsetAfterData,halfByte,numberOfValues) : dump;
template statistics "common/statistics_grid.def";
template missing_values "common/missing_values_grid.def";

1
definitions/grib2/template.7.0.def
View File

@ -32,3 +32,4 @@ meta unpackedError simple_packing_error(zero,binaryScaleFactor,decimalScaleFacto
alias data.packedValues=codedValues;
template statistics "common/statistics_grid.def";
template missing_values "common/missing_values_grid.def";

1
definitions/grib2/template.7.1.def
View File

@ -33,3 +33,4 @@ meta unpackedError simple_packing_error(zero,binaryScaleFactor,decimalScaleFacto
alias data.packedValues = codedValues;
template statistics "common/statistics_grid.def";
template missing_values "common/missing_values_grid.def";

8
definitions/grib2/template.7.2.def
View File

@ -45,9 +45,5 @@ meta values data_apply_bitmap(codedValues,
alias data.packedValues = codedValues;
template statistics "common/statistics_grid.def";
if(missingValueManagementUsed) {
#remove numberOfMissing;
#remove numberOfMissingValues;
meta numberOfMissing count_missing(bitmap,unusedBitsInBitmap,numberOfDataPoints,missingValueManagementUsed) : dump;
alias numberOfMissingValues=numberOfMissing;
}
meta numberOfMissing count_missing(bitmap,unusedBitsInBitmap,numberOfDataPoints,missingValueManagementUsed) : dump;
alias numberOfMissingValues=numberOfMissing;

9
definitions/grib2/template.7.3.def
View File

@ -42,9 +42,6 @@ meta values data_apply_bitmap(codedValues,
alias data.packedValues=codedValues;
template statistics "common/statistics_grid.def";
if(missingValueManagementUsed) {
#remove numberOfMissingValues;
#remove numberOfMissing;
meta numberOfMissing count_missing(bitmap,unusedBitsInBitmap,numberOfDataPoints,missingValueManagementUsed) : dump;
alias numberOfMissingValues=numberOfMissing;
}
meta numberOfMissing count_missing(bitmap,unusedBitsInBitmap,numberOfDataPoints,missingValueManagementUsed) : dump;
alias numberOfMissingValues=numberOfMissing;

1
definitions/grib2/template.7.4.def
View File

@ -20,3 +20,4 @@ meta values data_apply_bitmap(codedValues,
alias data.packedValues = codedValues;
template statistics "common/statistics_grid.def";
template missing_values "common/missing_values_grid.def";

1
definitions/grib2/template.7.40.def
View File

@ -49,3 +49,4 @@ meta values data_apply_bitmap(codedValues,
alias data.packedValues = codedValues;
template statistics "common/statistics_grid.def";
template missing_values "common/missing_values_grid.def";

1
definitions/grib2/template.7.41.def
View File

@ -30,3 +30,4 @@ meta values data_apply_bitmap(codedValues,
alias data.packedValues = codedValues;
template statistics "common/statistics_grid.def";
template missing_values "common/missing_values_grid.def";

1
definitions/grib2/template.7.42.def
View File

@ -33,3 +33,4 @@ meta unpackedError simple_packing_error(zero,binaryScaleFactor,decimalScaleFacto
alias data.packedValues = codedValues;
template statistics "common/statistics_grid.def";
template missing_values "common/missing_values_grid.def";

1
definitions/grib2/template.7.50001.def
View File

@ -99,3 +99,4 @@ if(bitmapPresent) {
meta packingError simple_packing_error(bitsPerValue,binaryScaleFactor,decimalScaleFactor,referenceValue,ieee) : no_copy;
template statistics "common/statistics_grid.def";
template missing_values "common/missing_values_grid.def";

1
definitions/grib2/template.7.50002.def
View File

@ -146,3 +146,4 @@ if(bitmapPresent) {
meta packingError simple_packing_error(bitsPerValue,binaryScaleFactor,decimalScaleFactor,referenceValue,ieee) : no_copy;
template statistics "common/statistics_grid.def";
template missing_values "common/missing_values_grid.def";

1
definitions/grib2/template.7.6.def
View File

@ -30,3 +30,4 @@ meta values data_apply_bitmap(codedValues,
alias data.packedValues = codedValues;
template statistics "common/statistics_grid.def";
template missing_values "common/missing_values_grid.def";

1
definitions/grib2/template.7.61.def
View File

@ -30,3 +30,4 @@ meta values data_apply_bitmap(codedValues,
alias data.packedValues = codedValues;
template statistics "common/statistics_grid.def";
template missing_values "common/missing_values_grid.def";

1
definitions/grib2/template.7.second_order.def
View File

@ -54,3 +54,4 @@ meta values data_apply_bitmap(codedValues,
alias data.packedValues = codedValues;
template statistics "common/statistics_grid.def";
template missing_values "common/missing_values_grid.def";