Definitions clean up

This commit is contained in:
Shahram Najm 2018-12-11 16:40:44 +00:00
parent fb711b9582
commit ee6ef39091
31 changed files with 6 additions and 94 deletions

View File

@ -70,6 +70,3 @@ unsigned[4] Dj : edition_specific,no_copy ;
alias latitudinalDirectionGridLength = Dj;
meta geography.DjInMetres
scale(Dj,oneConstant,thousand,truncateDegrees) : dump;
# END 2/template.3.10 ----------------------------------------------------------------------

View File

@ -7,8 +7,6 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
#
# START 2/template.3.140 ----------------------------------------------------------------------
# TEMPLATE 3.140, Lambert azimuthal equal area projection
include "grib2/template.3.shape_of_the_earth.def";
@ -67,5 +65,3 @@ meta latLonValues latlonvalues(values);
alias latitudeLongitudeValues=latLonValues;
meta latitudes latitudes(values,0);
meta longitudes longitudes(values,0);
# END 2/template.3.140 ----------------------------------------------------------------------

View File

@ -7,8 +7,6 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
#
# START 2/template.3.20 ----------------------------------------------------------------------
# TEMPLATE 3.20, Polar stereographic projection
include "grib2/template.3.shape_of_the_earth.def";
transient oneThousand=1000;
@ -91,5 +89,3 @@ meta latLonValues latlonvalues(values);
alias latitudeLongitudeValues=latLonValues;
meta latitudes latitudes(values,0);
meta longitudes longitudes(values,0);
# END 2/template.3.20 ----------------------------------------------------------------------

View File

@ -7,8 +7,6 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
#
# START 2/template.3.90 ----------------------------------------------------------------------
# TEMPLATE 3.90, Space view perspective or orthographic
include "grib2/template.3.shape_of_the_earth.def";

View File

@ -31,6 +31,3 @@ unsigned[4] endOfRange : dump;
# Number of values
unsigned[2] numberOfDataValues : read_only,dump;
# END 2/template.4.1002 ----------------------------------------------------------------------

View File

@ -7,8 +7,6 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
#
# START 2/template.4.20 ----------------------------------------------------------------------
# TEMPLATE 4.20, Radar product
# Parameter category
codetable[1] parameterCategory ('4.1.[discipline:l].table',masterDir,localDir) : dump;
@ -82,6 +80,3 @@ unsigned[3] rangeBinSpacing : dump;
# Radial angular spacing
# (tenths of degree true)
unsigned[2] radialAngularSpacing : dump;
# END 2/template.4.20 ----------------------------------------------------------------------

View File

@ -7,13 +7,10 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
#
# START 2/template.5.1 ----------------------------------------------------------------------
# TEMPLATE 5.1, Matrix values at grid point -simple packing
include "grib2/template.5.packing.def";
unsigned[1] matrixBitmapsPresent ;
# same as in edition 1
alias secondaryBitmapPresent=matrixBitmapsPresent;

View File

@ -7,8 +7,6 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
#
# START 2/template.5.2 ----------------------------------------------------------------------
# TEMPLATE 5.2, Grid point data - complex packing
include "grib2/template.5.packing.def";
@ -54,6 +52,3 @@ unsigned[4] trueLengthOfLastGroup ;
# by the length increment given in octet 42)
unsigned[1] numberOfBitsForScaledGroupLengths ;
alias numberOfBitsUsedForTheScaledGroupLengths=numberOfBitsForScaledGroupLengths;
# END 2/template.5.2 ----------------------------------------------------------------------

View File

@ -7,14 +7,11 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
#
# START 2/template.5.3 ----------------------------------------------------------------------
# TEMPLATE 5.3, Grid point data - complex packing and spatial differencing
include "grib2/template.5.packing.def";
include "grib2/template.5.original_values.def";
# Group splitting method used
codetable[1] groupSplittingMethodUsed ('5.4.table',masterDir,localDir);
@ -62,6 +59,3 @@ codetable[1] orderOfSpatialDifferencing ('5.6.table',masterDir,localDir);
# Number of octets required in the Data Section to specify extra descriptors needed for spatial differencing
# (octets 6-ww in Data Template 7.3)
unsigned[1] numberOfOctetsExtraDescriptors ;
# END 2/template.5.3 ----------------------------------------------------------------------

View File

@ -7,7 +7,6 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
#
# START 2/template.5.4 ----------------------------------------------------------------------
# TEMPLATE 5.4, Grid point data - IEEE packing
# added for conversion from other packing
transient bitsPerValue=0 : hidden;
@ -17,7 +16,4 @@ transient decimalScaleFactor=0 : hidden;
alias numberOfBits = bitsPerValue;
alias numberOfBitsContainingEachPackedValue = bitsPerValue;
codetable[1] precision ('5.7.table',masterDir,localDir) = 1 : edition_specific;
# END 2/template.5.4 ----------------------------------------------------------------------

View File

@ -21,5 +21,3 @@ codetable[1] typeOfCompressionUsed ('5.40.table',masterDir,localDir) ;
# when octet 22 indicates Lossy Compression. Otherwise, set to missing. (see Note 3)
unsigned[1] targetCompressionRatio = 255;
# END 2/template.5.40-------------------------------

View File

@ -7,8 +7,6 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
#
# TEMPLATE 5.51, Spherical harmonics data - complex packing
include "grib2/template.5.packing.def";

View File

@ -7,7 +7,6 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
#
ieeefloat referenceValue : no_copy;
meta referenceValueError reference_value_error(referenceValue,ieee);
@ -33,4 +32,3 @@ if (bitsPerValue) {
meta SPD spd(widthOfSPD,orderOfSPD) : read_only;
}
}

View File

@ -7,7 +7,6 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
#
ieeefloat referenceValue : no_copy;
meta referenceValueError reference_value_error(referenceValue,ieee);

View File

@ -7,8 +7,6 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
#
# TEMPLATE 5.51, Spherical harmonics data - complex packing
include "grib2/template.5.packing.def";
@ -19,7 +17,6 @@ if (gribex_mode_on()) {
transient computeLaplacianOperator=1 : hidden;
}
meta _numberOfValues spectral_truncation(J,K,M,numberOfValues): read_only;
constant laplacianScalingFactorUnset = -2147483647;

View File

@ -7,12 +7,9 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
#
# START 2/template.5.6 ----------------------------------------------------------------------
# Grid point data - Simple packing with preprocessing
include "grib2/template.5.packing.def";
codetable[1] typeOfPreProcessing ('5.9.table',masterDir,localDir) :edition_specific;
ieeefloat preProcessingParameter : read_only;
# END 2/template.5.6 ----------------------------------------------------------------------

View File

@ -7,12 +7,9 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
#
# START 2/template.5.61 ----------------------------------------------------------------------
# Grid point data - Simple packing with logarithmic preprocessing
constant typeOfPreProcessing=1;
include "grib2/template.5.packing.def";
ieeefloat preProcessingParameter : read_only;
# END 2/template.5.61 ----------------------------------------------------------------------

View File

@ -7,7 +7,6 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
#
# Reference value (R)
# The copy_ok means that the value is copied when changing the representation
# e.g. from jpeg to simple packing.
@ -29,4 +28,3 @@ transient optimizeScaleFactor = 0;
unsigned[1] bitsPerValue;
alias numberOfBits = bitsPerValue;
alias numberOfBitsContainingEachPackedValue = bitsPerValue;

View File

@ -7,7 +7,6 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
#
codetable[1] groupSplitting ('5.4.table',masterDir,localDir) = 1 ; #default general
codetable[1] missingValueManagement ('5.5.table',masterDir,localDir) = 0; #default as grib1
@ -27,4 +26,3 @@ unsigned[1] incrementOfLengths ;
unsigned[4] trueLengthOfLastGroup ;
unsigned[1] widthOfLengths ;

View File

@ -7,7 +7,6 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
#
# START 2/template.7.0 ----------------------------------------------------------------------
# TEMPLATE 7.0, Grid point data - simple packing
# Octets 6-nn : Binary data values - binary string, with each
# (scaled)

View File

@ -7,13 +7,12 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
#
# START 2/template.7.1 ----------------------------------------------------------------------
# TEMPLATE 7.1, Matrix values at grid point -simple packing
# Octets 6-nn : Binary data values - binary string, with each
# (scaled)
# ???? data_values__binary_string_with_each
meta codedValues data_g2simple_packing(
meta codedValues data_g2simple_packing(
section7Length,
offsetBeforeData,
offsetSection7,
@ -28,7 +27,7 @@
optimizeScaleFactor
): read_only;
meta values data_apply_bitmap(codedValues,
meta values data_apply_bitmap(codedValues,
bitmap,
missingValue,
binaryScaleFactor,

View File

@ -7,8 +7,6 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
#
# START 2/template.7.2 ----------------------------------------------------------------------
# TEMPLATE 7.2, Grid point data - complex packing
# Octets 6-xx : NG group reference values
# (XI in the decoding formula)
@ -57,5 +55,3 @@ meta values data_apply_bitmap(codedValues,
alias data.packedValues = codedValues;
template statistics "common/statistics_grid.def";
# END 2/template.7.2 ----------------------------------------------------------------------

View File

@ -7,8 +7,6 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
#
# START 2/template.7.3 ----------------------------------------------------------------------
# TEMPLATE 7.3, Grid point data - complex packing and spatial differencing
# Octets 6-ww : First value(s) of original
# (undifferenced)
@ -56,4 +54,3 @@ meta values data_apply_bitmap(codedValues,
alias data.packedValues=codedValues;
template statistics "common/statistics_grid.def";

View File

@ -7,7 +7,6 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
#
# START 2/template.7.4 ----------------------------------------------------------------------
# TEMPLATE 7.4, Grid point data - simple packing
# Octets 6-nn : Binary data values - binary string, with each
# (scaled)

View File

@ -7,8 +7,6 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
#
# START 2/template.7.40 ----------------------------------------------------------------------
# TEMPLATE 7.40, Grid point data - jpeg2000
# Octets 6-xx : NG group reference values
# (XI in the decoding formula)

View File

@ -7,11 +7,8 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
#
# START 2/template.7.41 ----------------------------------------------------------------------
# TEMPLATE 7.41, Grid point data - png
meta codedValues data_png_packing(
meta codedValues data_png_packing(
section7Length,
offsetBeforeData,
offsetSection7,
@ -22,7 +19,6 @@
bitsPerValue,
# For encoding
Nx,
Ny,

View File

@ -7,11 +7,8 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
#
# START 2/template.7.42 ----------------------------------------------------------------------
# TEMPLATE 7.42, Grid point data - CCSDS
meta codedValues data_ccsds_packing(
meta codedValues data_ccsds_packing(
section7Length,
offsetBeforeData,
offsetSection7,

View File

@ -7,8 +7,6 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
#
# START 2/template.7.50 ----------------------------------------------------------------------
# TEMPLATE 7.50, Spectral data - simple packing
# Octets 6-nn : Binary data values - binary string, with each
# (scaled)

View File

@ -7,13 +7,11 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
#
# START 2/template.7.6 ----------------------------------------------------------------------
# TEMPLATE 7.6, Grid point data - simple packing with preprocessing
# Octets 6-nn : Binary data values - binary string, with each
# (scaled)
# ???? data_values__binary_string_with_each
meta codedValues data_g2simple_packing_with_preprocessing(
meta codedValues data_g2simple_packing_with_preprocessing(
section7Length,
offsetBeforeData,
offsetSection7,

View File

@ -7,13 +7,11 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
#
# START 2/template.7.6 ----------------------------------------------------------------------
# TEMPLATE 7.6, Grid point data - simple packing with preprocessing
# Octets 6-nn : Binary data values - binary string, with each
# (scaled)
# ???? data_values__binary_string_with_each
meta codedValues data_g2simple_packing_with_preprocessing(
meta codedValues data_g2simple_packing_with_preprocessing(
section7Length,
offsetBeforeData,
offsetSection7,

View File

@ -7,8 +7,6 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
#
# START 2/template.7.2 ----------------------------------------------------------------------
# TEMPLATE 7.2, Grid point data - complex packing
position offsetBeforeData;
@ -63,5 +61,3 @@ meta values data_apply_bitmap(codedValues,
alias data.packedValues = codedValues;
template statistics "common/statistics_grid.def";
# END 2/template.7.2 ----------------------------------------------------------------------