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

Merge

This commit is contained in:
Shahram Najm 2021-08-10 23:09:05 +01:00
parent 637e28abcf 874f5fe39b
commit 9f2e4bdfab
20 changed files with 1320 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
.github/workflows/ci.yml vendored Normal file
View File

@ -0,0 +1,80 @@
name: ci
# Controls when the action will run
on:
# Trigger the workflow on all pushes, except on tag creation
push:
branches:
- '**'
tags-ignore:
- '**'
# Trigger the workflow on all pull requests
pull_request: ~
# Allow workflow to be dispatched on demand
workflow_dispatch: ~
jobs:
ci:
name: ci
strategy:
matrix:
name:
- gnu-10@ubuntu-20.04
- clang-12@ubuntu-20.04
- gnu-10@ubuntu-18.04
- clang-9@ubuntu-18.04
- gnu-10@macos-10.15
- clang-12@macos-10.15
include:
- name: gnu-10@ubuntu-20.04
os: ubuntu-20.04
compiler: gnu-10
compiler_cc: gcc-10
compiler_fc: gfortran-10
- name: clang-12@ubuntu-20.04
os: ubuntu-20.04
compiler: clang-12
compiler_cc: clang-12
compiler_fc: gfortran-10
- name: gnu-10@ubuntu-18.04
os: ubuntu-18.04
compiler: gnu-10
compiler_cc: gcc-10
compiler_fc: gfortran-10
- name: clang-9@ubuntu-18.04
os: ubuntu-18.04
compiler: clang-9
compiler_cc: clang-9
compiler_fc: gfortran-9
- name: gnu-10@macos-10.15
os: macos-10.15
compiler: gnu-10
compiler_cc: gcc-10
compiler_fc: gfortran-10
- name: clang-12@macos-10.15
os: macos-10.15
compiler: clang-12
compiler_cc: ~
compiler_cxx: ~
compiler_fc: gfortran-10
runs-on: ${{ matrix.os }}
steps:
- name: Checkout Repository
uses: actions/checkout@v2
- name: Build & Test
id: build-test
uses: ecmwf-actions/build-package@v1
with:
self_coverage: true
dependencies: ecmwf/ecbuild
dependency_branch: develop
- name: Codecov Upload
if: steps.build-test.outputs.coverage_file && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop')
uses: codecov/codecov-action@v2
with:
files: ${{ steps.build-test.outputs.coverage_file }}

1
CMakeLists.txt
View File

@ -274,6 +274,7 @@ if( HAVE_ECCODES_THREADS )
ecbuild_critical("Pthreads is not supported on your system: thread library found=[${CMAKE_THREAD_LIBS_INIT}]") ecbuild_critical("Pthreads is not supported on your system: thread library found=[${CMAKE_THREAD_LIBS_INIT}]")
endif() endif()
set( GRIB_PTHREADS 1 ) set( GRIB_PTHREADS 1 )
set( ECCODES_PTHREADS_LIBRARIES Threads::Threads ) # ECC-1268
if( ${CMAKE_SYSTEM_NAME} MATCHES "Linux" ) if( ${CMAKE_SYSTEM_NAME} MATCHES "Linux" )
set( GRIB_LINUX_PTHREADS 1 ) set( GRIB_LINUX_PTHREADS 1 )
endif() endif()

4
definitions/add_params_from_tsv.pl
View File

@ -131,6 +131,10 @@ while (<>) {
die "Error: paramID \"$paramId\" is not an integer (input row=$lcount)!\n" if (!is_integer($paramId)); die "Error: paramID \"$paramId\" is not an integer (input row=$lcount)!\n" if (!is_integer($paramId));
die "Error: shortName \"$shortName\" has an invalid character (input row=$lcount)!\n" if ($shortName =~ /[ '"]/); die "Error: shortName \"$shortName\" has an invalid character (input row=$lcount)!\n" if ($shortName =~ /[ '"]/);
die "Error: name \"$name\" should have uppercase 1st letter or digit (input row=$lcount)!\n" if ($name !~ /^[A-Z0-9]/); die "Error: name \"$name\" should have uppercase 1st letter or digit (input row=$lcount)!\n" if ($name !~ /^[A-Z0-9]/);
die "Error: typeOfFirstFixedSurface \"$type1\" is not an integer (input row=$lcount)!\tPick a value from Code Table 4.5\n"
if ($type1 ne "" && !is_integer($type1));
die "Error: typeOfSecondFixedSurface \"$type2\" is not an integer (input row=$lcount)!\tPick a value from Code Table 4.5\n"
if ($type2 ne "" && !is_integer($type2));
$units = "~" if ($units eq ""); $units = "~" if ($units eq "");
$cfVarName = $shortName; $cfVarName = $shortName;

2
definitions/grib2/grib2LocalSectionNumber.98.table
View File

@ -19,7 +19,7 @@
36 36 MARS labelling for long window 4DVar system 36 36 MARS labelling for long window 4DVar system
38 38 4D variational increments for long window 4DVar system 38 38 4D variational increments for long window 4DVar system
39 39 4DVar model errors for long window 4Dvar system 39 39 4DVar model errors for long window 4Dvar system
41 41 The European Flood Awareness System 41 41 The Flood Awareness System
42 42 Lead Centre for Wave Forecast Verification 42 42 Lead Centre for Wave Forecast Verification
192 192 Multiple ECMWF local definitions 192 192 Multiple ECMWF local definitions
300 300 Multi-dimensional parameters 300 300 Multi-dimensional parameters

15
definitions/grib2/local.98.41.def
View File

@ -1,6 +1,6 @@
# (C) Copyright 2005- ECMWF. # (C) Copyright 2005- ECMWF.
# Local definition 41 - The European Flood Awareness System # Local definition 41 - The Flood Awareness System
# isFillup can be 0, 1 or missing # isFillup can be 0, 1 or missing
# When it is 0, it means "Water Balance" # When it is 0, it means "Water Balance"
@ -8,11 +8,13 @@ unsigned[1] isFillup = missing() : dump, can_be_missing;
alias local.isFillup = isFillup; alias local.isFillup = isFillup;
# Forecast Reference Date and Time # Forecast Reference Date and Time
unsigned[2] yearOfForecast = year : dump; # ECC-1264: When isFillup is missing, these should also be set to missing
unsigned[1] monthOfForecast = month : dump; # and dateOfForecast, timeOfForecast, anoffset are not relevant
unsigned[1] dayOfForecast = day : dump; unsigned[2] yearOfForecast = year : dump, can_be_missing;
unsigned[1] hourOfForecast = hour : dump; unsigned[1] monthOfForecast = month : dump, can_be_missing;
unsigned[1] minuteOfForecast = minute : dump; unsigned[1] dayOfForecast = day : dump, can_be_missing;
unsigned[1] hourOfForecast = hour : dump, can_be_missing;
unsigned[1] minuteOfForecast = minute : dump, can_be_missing;
constant secondOfForecast = 0; constant secondOfForecast = 0;
meta dateOfForecast g2date(yearOfForecast,monthOfForecast, dayOfForecast) : dump; meta dateOfForecast g2date(yearOfForecast,monthOfForecast, dayOfForecast) : dump;
meta timeOfForecast time (hourOfForecast,minuteOfForecast,secondOfForecast) : dump; meta timeOfForecast time (hourOfForecast,minuteOfForecast,secondOfForecast) : dump;
@ -29,6 +31,7 @@ meta _anoffset round(diffInHours, 10): dump,long_type;
transient anoffset = _anoffset; # needed to force anoffset to be integer transient anoffset = _anoffset; # needed to force anoffset to be integer
alias local.anoffset = anoffset; alias local.anoffset = anoffset;
# ECC-662 # ECC-662
unsigned[2] anoffsetFirst = missing(): dump, can_be_missing; unsigned[2] anoffsetFirst = missing(): dump, can_be_missing;
unsigned[2] anoffsetLast = missing(): dump, can_be_missing; unsigned[2] anoffsetLast = missing(): dump, can_be_missing;

30
definitions/grib2/local/kwbc/template.3.32769.def Normal file
View File

@ -0,0 +1,30 @@
# (C) Copyright 2005- ECMWF.
# TEMPLATE 3.32769 - Rotate Latitude/Longitude (Arakawa Non-E Staggered grid)
# See https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_temp3-32769.shtml
include "grib2/template.3.shape_of_the_earth.def";
include "grib2/template.3.grid.def";
meta latitudeOfFirstGridPointInDegrees scale(La1,one,grib2divider,truncateDegrees) : dump;
meta longitudeOfFirstGridPointInDegrees scale(Lo1,one,grib2divider,truncateDegrees) : dump;
alias La1InDegrees = latitudeOfFirstGridPointInDegrees;
alias Lo1InDegrees = longitudeOfFirstGridPointInDegrees;
meta latitudeOfLastGridPointInDegrees scale(La2,one,grib2divider,truncateDegrees) : dump;
meta longitudeOfLastGridPointInDegrees scale(Lo2,one,grib2divider,truncateDegrees) : dump;
alias La2InDegrees = latitudeOfLastGridPointInDegrees;
alias Lo2InDegrees = longitudeOfLastGridPointInDegrees;
alias centreLatitude = latitudeOfLastGridPoint;
alias centreLongitude = longitudeOfLastGridPoint;
alias centreLatitudeInDegrees = latitudeOfLastGridPointInDegrees;
alias centreLongitudeInDegrees = longitudeOfLastGridPointInDegrees;
unsigned[4] Di : can_be_missing; # Longitudinal direction increment
unsigned[4] Dj : can_be_missing; # Latitudinal direction increment
flags[1] scanningMode 'grib2/tables/[tablesVersion]/3.4.table' : edition_specific,no_copy;
signed[4] latitudeOfGridPoints : dump;
unsigned[4] longitudeOfGridPoints: dump;

276
definitions/grib2/localConcepts/kwbc/name.def
View File

@ -1649,3 +1649,279 @@
parameterCategory = 1 ; parameterCategory = 1 ;
parameterNumber = 8 ; parameterNumber = 8 ;
} }
#Simulated Brightness Temperature for AMSRE on Aqua, Channel 10
'Simulated Brightness Temperature for AMSRE on Aqua, Channel 10' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 11 ;
}
#Simulated Brightness Temperature for AMSRE on Aqua, Channel 11
'Simulated Brightness Temperature for AMSRE on Aqua, Channel 11' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 12 ;
}
#Simulated Brightness Temperature for AMSRE on Aqua, Channel 12
'Simulated Brightness Temperature for AMSRE on Aqua, Channel 12' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 13 ;
}
#Simulated Brightness Temperature for AMSRE on Aqua, Channel 9
'Simulated Brightness Temperature for AMSRE on Aqua, Channel 9' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 10 ;
}
#Simulated Brightness Counts for GOES 12, Channel 3
'Simulated Brightness Counts for GOES 12, Channel 3' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 4 ;
}
#Simulated Brightness Counts for GOES 12, Channel 4
'Simulated Brightness Counts for GOES 12, Channel 4' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 5 ;
}
#Simulated Brightness Temperature for GOES 11, Channel 2
'Simulated Brightness Temperature for GOES 11, Channel 2' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 6 ;
}
#Simulated Brightness Temperature for GOES 11, Channel 3
'Simulated Brightness Temperature for GOES 11, Channel 3' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 7 ;
}
#Simulated Brightness Temperature for GOES 11, Channel 4
'Simulated Brightness Temperature for GOES 11, Channel 4' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 8 ;
}
#Simulated Brightness Temperature for GOES 11, Channel 5
'Simulated Brightness Temperature for GOES 11, Channel 5' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 9 ;
}
#Simulated Brightness Temperature for GOES 12, Channel 2
'Simulated Brightness Temperature for GOES 12, Channel 2' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 0 ;
}
#Simulated Brightness Temperature for GOES 12, Channel 3
'Simulated Brightness Temperature for GOES 12, Channel 3' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 1 ;
}
#Simulated Brightness Temperature for GOES 12, Channel 4
'Simulated Brightness Temperature for GOES 12, Channel 4' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 2 ;
}
#Simulated Brightness Temperature for GOES 12, Channel 6
'Simulated Brightness Temperature for GOES 12, Channel 6' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 3 ;
}
#Simulated Brightness Temperature for ABI GOES-16, Band-10
'Simulated Brightness Temperature for ABI GOES-16, Band-10' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 23 ;
}
#Simulated Brightness Temperature for ABI GOES-16, Band-11
'Simulated Brightness Temperature for ABI GOES-16, Band-11' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 24 ;
}
#Simulated Brightness Temperature for ABI GOES-16, Band-12
'Simulated Brightness Temperature for ABI GOES-16, Band-12' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 25 ;
}
#Simulated Brightness Temperature for ABI GOES-16, Band-13
'Simulated Brightness Temperature for ABI GOES-16, Band-13' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 26 ;
}
#Simulated Brightness Temperature for ABI GOES-16, Band-14
'Simulated Brightness Temperature for ABI GOES-16, Band-14' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 27 ;
}
#Simulated Brightness Temperature for ABI GOES-16, Band-15
'Simulated Brightness Temperature for ABI GOES-16, Band-15' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 28 ;
}
#Simulated Brightness Temperature for ABI GOES-16, Band-16
'Simulated Brightness Temperature for ABI GOES-16, Band-16' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 29 ;
}
#Simulated Brightness Temperature for ABI GOES-16, Band-7
'Simulated Brightness Temperature for ABI GOES-16, Band-7' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 20 ;
}
#Simulated Brightness Temperature for ABI GOES-16, Band-8
'Simulated Brightness Temperature for ABI GOES-16, Band-8' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 21 ;
}
#Simulated Brightness Temperature for ABI GOES-16, Band-9
'Simulated Brightness Temperature for ABI GOES-16, Band-9' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 22 ;
}
#Simulated Brightness Temperature for ABI GOES-17, Band-10
'Simulated Brightness Temperature for ABI GOES-17, Band-10' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 39 ;
}
#Simulated Brightness Temperature for ABI GOES-17, Band-11
'Simulated Brightness Temperature for ABI GOES-17, Band-11' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 40 ;
}
#Simulated Brightness Temperature for ABI GOES-17, Band-12
'Simulated Brightness Temperature for ABI GOES-17, Band-12' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 41 ;
}
#Simulated Brightness Temperature for ABI GOES-17, Band-13
'Simulated Brightness Temperature for ABI GOES-17, Band-13' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 42 ;
}
#Simulated Brightness Temperature for ABI GOES-17, Band-14
'Simulated Brightness Temperature for ABI GOES-17, Band-14' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 43 ;
}
#Simulated Brightness Temperature for ABI GOES-17, Band-15
'Simulated Brightness Temperature for ABI GOES-17, Band-15' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 44 ;
}
#Simulated Brightness Temperature for ABI GOES-17, Band-16
'Simulated Brightness Temperature for ABI GOES-17, Band-16' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 45 ;
}
#Simulated Brightness Temperature for ABI GOES-17, Band-7
'Simulated Brightness Temperature for ABI GOES-17, Band-7' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 36 ;
}
#Simulated Brightness Temperature for ABI GOES-17, Band-8
'Simulated Brightness Temperature for ABI GOES-17, Band-8' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 37 ;
}
#Simulated Brightness Temperature for ABI GOES-17, Band-9
'Simulated Brightness Temperature for ABI GOES-17, Band-9' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 38 ;
}
#Simulated Reflectance Factor for ABI GOES-16, Band-1
'Simulated Reflectance Factor for ABI GOES-16, Band-1' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 14 ;
}
#Simulated Reflectance Factor for ABI GOES-16, Band-2
'Simulated Reflectance Factor for ABI GOES-16, Band-2' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 15 ;
}
#Simulated Reflectance Factor for ABI GOES-16, Band-3
'Simulated Reflectance Factor for ABI GOES-16, Band-3' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 16 ;
}
#Simulated Reflectance Factor for ABI GOES-16, Band-4
'Simulated Reflectance Factor for ABI GOES-16, Band-4' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 17 ;
}
#Simulated Reflectance Factor for ABI GOES-16, Band-5
'Simulated Reflectance Factor for ABI GOES-16, Band-5' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 18 ;
}
#Simulated Reflectance Factor for ABI GOES-16, Band-6
'Simulated Reflectance Factor for ABI GOES-16, Band-6' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 19 ;
}
#Simulated Reflectance Factor for ABI GOES-17, Band-1
'Simulated Reflectance Factor for ABI GOES-17, Band-1' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 30 ;
}
#Simulated Reflectance Factor for ABI GOES-17, Band-2
'Simulated Reflectance Factor for ABI GOES-17, Band-2' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 31 ;
}
#Simulated Reflectance Factor for ABI GOES-17, Band-3
'Simulated Reflectance Factor for ABI GOES-17, Band-3' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 32 ;
}
#Simulated Reflectance Factor for ABI GOES-17, Band-4
'Simulated Reflectance Factor for ABI GOES-17, Band-4' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 33 ;
}
#Simulated Reflectance Factor for ABI GOES-17, Band-5
'Simulated Reflectance Factor for ABI GOES-17, Band-5' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 34 ;
}
#Simulated Reflectance Factor for ABI GOES-17, Band-6
'Simulated Reflectance Factor for ABI GOES-17, Band-6' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 35 ;
}

276
definitions/grib2/localConcepts/kwbc/paramId.def
View File

@ -1649,3 +1649,279 @@
parameterCategory = 1 ; parameterCategory = 1 ;
parameterNumber = 8 ; parameterNumber = 8 ;
} }
#Simulated Brightness Temperature for AMSRE on Aqua, Channel 10
'7001294' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 11 ;
}
#Simulated Brightness Temperature for AMSRE on Aqua, Channel 11
'7001295' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 12 ;
}
#Simulated Brightness Temperature for AMSRE on Aqua, Channel 12
'7001296' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 13 ;
}
#Simulated Brightness Temperature for AMSRE on Aqua, Channel 9
'7001297' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 10 ;
}
#Simulated Brightness Counts for GOES 12, Channel 3
'7001298' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 4 ;
}
#Simulated Brightness Counts for GOES 12, Channel 4
'7001299' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 5 ;
}
#Simulated Brightness Temperature for GOES 11, Channel 2
'7001300' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 6 ;
}
#Simulated Brightness Temperature for GOES 11, Channel 3
'7001301' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 7 ;
}
#Simulated Brightness Temperature for GOES 11, Channel 4
'7001302' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 8 ;
}
#Simulated Brightness Temperature for GOES 11, Channel 5
'7001303' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 9 ;
}
#Simulated Brightness Temperature for GOES 12, Channel 2
'7001304' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 0 ;
}
#Simulated Brightness Temperature for GOES 12, Channel 3
'7001305' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 1 ;
}
#Simulated Brightness Temperature for GOES 12, Channel 4
'7001306' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 2 ;
}
#Simulated Brightness Temperature for GOES 12, Channel 6
'7001307' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 3 ;
}
#Simulated Brightness Temperature for ABI GOES-16, Band-10
'7001308' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 23 ;
}
#Simulated Brightness Temperature for ABI GOES-16, Band-11
'7001309' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 24 ;
}
#Simulated Brightness Temperature for ABI GOES-16, Band-12
'7001310' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 25 ;
}
#Simulated Brightness Temperature for ABI GOES-16, Band-13
'7001311' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 26 ;
}
#Simulated Brightness Temperature for ABI GOES-16, Band-14
'7001312' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 27 ;
}
#Simulated Brightness Temperature for ABI GOES-16, Band-15
'7001313' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 28 ;
}
#Simulated Brightness Temperature for ABI GOES-16, Band-16
'7001314' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 29 ;
}
#Simulated Brightness Temperature for ABI GOES-16, Band-7
'7001315' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 20 ;
}
#Simulated Brightness Temperature for ABI GOES-16, Band-8
'7001316' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 21 ;
}
#Simulated Brightness Temperature for ABI GOES-16, Band-9
'7001317' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 22 ;
}
#Simulated Brightness Temperature for ABI GOES-17, Band-10
'7001318' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 39 ;
}
#Simulated Brightness Temperature for ABI GOES-17, Band-11
'7001319' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 40 ;
}
#Simulated Brightness Temperature for ABI GOES-17, Band-12
'7001320' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 41 ;
}
#Simulated Brightness Temperature for ABI GOES-17, Band-13
'7001321' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 42 ;
}
#Simulated Brightness Temperature for ABI GOES-17, Band-14
'7001322' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 43 ;
}
#Simulated Brightness Temperature for ABI GOES-17, Band-15
'7001323' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 44 ;
}
#Simulated Brightness Temperature for ABI GOES-17, Band-16
'7001324' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 45 ;
}
#Simulated Brightness Temperature for ABI GOES-17, Band-7
'7001325' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 36 ;
}
#Simulated Brightness Temperature for ABI GOES-17, Band-8
'7001326' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 37 ;
}
#Simulated Brightness Temperature for ABI GOES-17, Band-9
'7001327' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 38 ;
}
#Simulated Reflectance Factor for ABI GOES-16, Band-1
'7001328' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 14 ;
}
#Simulated Reflectance Factor for ABI GOES-16, Band-2
'7001329' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 15 ;
}
#Simulated Reflectance Factor for ABI GOES-16, Band-3
'7001330' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 16 ;
}
#Simulated Reflectance Factor for ABI GOES-16, Band-4
'7001331' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 17 ;
}
#Simulated Reflectance Factor for ABI GOES-16, Band-5
'7001332' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 18 ;
}
#Simulated Reflectance Factor for ABI GOES-16, Band-6
'7001333' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 19 ;
}
#Simulated Reflectance Factor for ABI GOES-17, Band-1
'7001334' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 30 ;
}
#Simulated Reflectance Factor for ABI GOES-17, Band-2
'7001335' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 31 ;
}
#Simulated Reflectance Factor for ABI GOES-17, Band-3
'7001336' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 32 ;
}
#Simulated Reflectance Factor for ABI GOES-17, Band-4
'7001337' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 33 ;
}
#Simulated Reflectance Factor for ABI GOES-17, Band-5
'7001338' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 34 ;
}
#Simulated Reflectance Factor for ABI GOES-17, Band-6
'7001339' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 35 ;
}

276
definitions/grib2/localConcepts/kwbc/shortName.def
View File

@ -1649,3 +1649,279 @@
parameterCategory = 1 ; parameterCategory = 1 ;
parameterNumber = 8 ; parameterNumber = 8 ;
} }
#Simulated Brightness Temperature for AMSRE on Aqua, Channel 10
'AMSRE10' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 11 ;
}
#Simulated Brightness Temperature for AMSRE on Aqua, Channel 11
'AMSRE11' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 12 ;
}
#Simulated Brightness Temperature for AMSRE on Aqua, Channel 12
'AMSRE12' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 13 ;
}
#Simulated Brightness Temperature for AMSRE on Aqua, Channel 9
'AMSRE9' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 10 ;
}
#Simulated Brightness Counts for GOES 12, Channel 3
'SBC123' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 4 ;
}
#Simulated Brightness Counts for GOES 12, Channel 4
'SBC124' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 5 ;
}
#Simulated Brightness Temperature for GOES 11, Channel 2
'SBT112' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 6 ;
}
#Simulated Brightness Temperature for GOES 11, Channel 3
'SBT113' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 7 ;
}
#Simulated Brightness Temperature for GOES 11, Channel 4
'SBT114' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 8 ;
}
#Simulated Brightness Temperature for GOES 11, Channel 5
'SBT115' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 9 ;
}
#Simulated Brightness Temperature for GOES 12, Channel 2
'SBT122' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 0 ;
}
#Simulated Brightness Temperature for GOES 12, Channel 3
'SBT123' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 1 ;
}
#Simulated Brightness Temperature for GOES 12, Channel 4
'SBT124' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 2 ;
}
#Simulated Brightness Temperature for GOES 12, Channel 6
'SBT126' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 3 ;
}
#Simulated Brightness Temperature for ABI GOES-16, Band-10
'SBTA1610' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 23 ;
}
#Simulated Brightness Temperature for ABI GOES-16, Band-11
'SBTA1611' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 24 ;
}
#Simulated Brightness Temperature for ABI GOES-16, Band-12
'SBTA1612' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 25 ;
}
#Simulated Brightness Temperature for ABI GOES-16, Band-13
'SBTA1613' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 26 ;
}
#Simulated Brightness Temperature for ABI GOES-16, Band-14
'SBTA1614' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 27 ;
}
#Simulated Brightness Temperature for ABI GOES-16, Band-15
'SBTA1615' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 28 ;
}
#Simulated Brightness Temperature for ABI GOES-16, Band-16
'SBTA1616' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 29 ;
}
#Simulated Brightness Temperature for ABI GOES-16, Band-7
'SBTA167' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 20 ;
}
#Simulated Brightness Temperature for ABI GOES-16, Band-8
'SBTA168' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 21 ;
}
#Simulated Brightness Temperature for ABI GOES-16, Band-9
'SBTA169' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 22 ;
}
#Simulated Brightness Temperature for ABI GOES-17, Band-10
'SBTA1710' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 39 ;
}
#Simulated Brightness Temperature for ABI GOES-17, Band-11
'SBTA1711' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 40 ;
}
#Simulated Brightness Temperature for ABI GOES-17, Band-12
'SBTA1712' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 41 ;
}
#Simulated Brightness Temperature for ABI GOES-17, Band-13
'SBTA1713' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 42 ;
}
#Simulated Brightness Temperature for ABI GOES-17, Band-14
'SBTA1714' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 43 ;
}
#Simulated Brightness Temperature for ABI GOES-17, Band-15
'SBTA1715' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 44 ;
}
#Simulated Brightness Temperature for ABI GOES-17, Band-16
'SBTA1716' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 45 ;
}
#Simulated Brightness Temperature for ABI GOES-17, Band-7
'SBTA177' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 36 ;
}
#Simulated Brightness Temperature for ABI GOES-17, Band-8
'SBTA178' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 37 ;
}
#Simulated Brightness Temperature for ABI GOES-17, Band-9
'SBTA179' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 38 ;
}
#Simulated Reflectance Factor for ABI GOES-16, Band-1
'SRFA161' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 14 ;
}
#Simulated Reflectance Factor for ABI GOES-16, Band-2
'SRFA162' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 15 ;
}
#Simulated Reflectance Factor for ABI GOES-16, Band-3
'SRFA163' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 16 ;
}
#Simulated Reflectance Factor for ABI GOES-16, Band-4
'SRFA164' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 17 ;
}
#Simulated Reflectance Factor for ABI GOES-16, Band-5
'SRFA165' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 18 ;
}
#Simulated Reflectance Factor for ABI GOES-16, Band-6
'SRFA166' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 19 ;
}
#Simulated Reflectance Factor for ABI GOES-17, Band-1
'SRFA171' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 30 ;
}
#Simulated Reflectance Factor for ABI GOES-17, Band-2
'SRFA172' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 31 ;
}
#Simulated Reflectance Factor for ABI GOES-17, Band-3
'SRFA173' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 32 ;
}
#Simulated Reflectance Factor for ABI GOES-17, Band-4
'SRFA174' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 33 ;
}
#Simulated Reflectance Factor for ABI GOES-17, Band-5
'SRFA175' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 34 ;
}
#Simulated Reflectance Factor for ABI GOES-17, Band-6
'SRFA176' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 35 ;
}

276
definitions/grib2/localConcepts/kwbc/units.def
View File

@ -1649,3 +1649,279 @@
parameterCategory = 1 ; parameterCategory = 1 ;
parameterNumber = 8 ; parameterNumber = 8 ;
} }
#Simulated Brightness Temperature for AMSRE on Aqua, Channel 10
'K' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 11 ;
}
#Simulated Brightness Temperature for AMSRE on Aqua, Channel 11
'K' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 12 ;
}
#Simulated Brightness Temperature for AMSRE on Aqua, Channel 12
'K' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 13 ;
}
#Simulated Brightness Temperature for AMSRE on Aqua, Channel 9
'K' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 10 ;
}
#Simulated Brightness Counts for GOES 12, Channel 3
'Byte' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 4 ;
}
#Simulated Brightness Counts for GOES 12, Channel 4
'Byte' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 5 ;
}
#Simulated Brightness Temperature for GOES 11, Channel 2
'K' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 6 ;
}
#Simulated Brightness Temperature for GOES 11, Channel 3
'K' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 7 ;
}
#Simulated Brightness Temperature for GOES 11, Channel 4
'K' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 8 ;
}
#Simulated Brightness Temperature for GOES 11, Channel 5
'K' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 9 ;
}
#Simulated Brightness Temperature for GOES 12, Channel 2
'K' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 0 ;
}
#Simulated Brightness Temperature for GOES 12, Channel 3
'K' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 1 ;
}
#Simulated Brightness Temperature for GOES 12, Channel 4
'K' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 2 ;
}
#Simulated Brightness Temperature for GOES 12, Channel 6
'K' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 3 ;
}
#Simulated Brightness Temperature for ABI GOES-16, Band-10
'K' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 23 ;
}
#Simulated Brightness Temperature for ABI GOES-16, Band-11
'K' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 24 ;
}
#Simulated Brightness Temperature for ABI GOES-16, Band-12
'K' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 25 ;
}
#Simulated Brightness Temperature for ABI GOES-16, Band-13
'K' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 26 ;
}
#Simulated Brightness Temperature for ABI GOES-16, Band-14
'K' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 27 ;
}
#Simulated Brightness Temperature for ABI GOES-16, Band-15
'K' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 28 ;
}
#Simulated Brightness Temperature for ABI GOES-16, Band-16
'K' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 29 ;
}
#Simulated Brightness Temperature for ABI GOES-16, Band-7
'K' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 20 ;
}
#Simulated Brightness Temperature for ABI GOES-16, Band-8
'K' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 21 ;
}
#Simulated Brightness Temperature for ABI GOES-16, Band-9
'K' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 22 ;
}
#Simulated Brightness Temperature for ABI GOES-17, Band-10
'K' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 39 ;
}
#Simulated Brightness Temperature for ABI GOES-17, Band-11
'K' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 40 ;
}
#Simulated Brightness Temperature for ABI GOES-17, Band-12
'K' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 41 ;
}
#Simulated Brightness Temperature for ABI GOES-17, Band-13
'K' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 42 ;
}
#Simulated Brightness Temperature for ABI GOES-17, Band-14
'K' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 43 ;
}
#Simulated Brightness Temperature for ABI GOES-17, Band-15
'K' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 44 ;
}
#Simulated Brightness Temperature for ABI GOES-17, Band-16
'K' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 45 ;
}
#Simulated Brightness Temperature for ABI GOES-17, Band-7
'K' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 36 ;
}
#Simulated Brightness Temperature for ABI GOES-17, Band-8
'K' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 37 ;
}
#Simulated Brightness Temperature for ABI GOES-17, Band-9
'K' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 38 ;
}
#Simulated Reflectance Factor for ABI GOES-16, Band-1
'-' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 14 ;
}
#Simulated Reflectance Factor for ABI GOES-16, Band-2
'-' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 15 ;
}
#Simulated Reflectance Factor for ABI GOES-16, Band-3
'-' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 16 ;
}
#Simulated Reflectance Factor for ABI GOES-16, Band-4
'-' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 17 ;
}
#Simulated Reflectance Factor for ABI GOES-16, Band-5
'-' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 18 ;
}
#Simulated Reflectance Factor for ABI GOES-16, Band-6
'-' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 19 ;
}
#Simulated Reflectance Factor for ABI GOES-17, Band-1
'-' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 30 ;
}
#Simulated Reflectance Factor for ABI GOES-17, Band-2
'-' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 31 ;
}
#Simulated Reflectance Factor for ABI GOES-17, Band-3
'-' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 32 ;
}
#Simulated Reflectance Factor for ABI GOES-17, Band-4
'-' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 33 ;
}
#Simulated Reflectance Factor for ABI GOES-17, Band-5
'-' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 34 ;
}
#Simulated Reflectance Factor for ABI GOES-17, Band-6
'-' = {
discipline = 3 ;
parameterCategory = 192 ;
parameterNumber = 35 ;
}

7
definitions/grib2/section.3.def
View File

@ -35,7 +35,11 @@ meta gridDefinitionDescription codetable_title(gridDefinitionTemplateNumber);
alias isRotatedGrid=zero; alias isRotatedGrid=zero;
if (gridDefinitionTemplateNumber >= 32768) {
template gridDefinitionSection "grib2/local/[centreForLocal]/template.3.[gridDefinitionTemplateNumber:l].def";
} else {
template gridDefinitionSection "grib2/template.3.[gridDefinitionTemplateNumber:l].def"; template gridDefinitionSection "grib2/template.3.[gridDefinitionTemplateNumber:l].def";
}
if(PLPresent){ if(PLPresent){
if(numberOfOctectsForNumberOfPoints == 1){ if(numberOfOctectsForNumberOfPoints == 1){
@ -106,6 +110,9 @@ concept gridType {
"lambert_bf" = { gridDefinitionTemplateNumber=63; PLPresent=0; } "lambert_bf" = { gridDefinitionTemplateNumber=63; PLPresent=0; }
"mercator_bf" = { gridDefinitionTemplateNumber=61; PLPresent=0; } "mercator_bf" = { gridDefinitionTemplateNumber=61; PLPresent=0; }
"polar_stereographic_bf" = { gridDefinitionTemplateNumber=62; PLPresent=0; } "polar_stereographic_bf" = { gridDefinitionTemplateNumber=62; PLPresent=0; }
"ncep_32769" = { centre=7; gridDefinitionTemplateNumber=32769; PLPresent=0; }
"unknown" = {PLPresent=0;} "unknown" = {PLPresent=0;}
"unknown_PLPresent" = {PLPresent=1;} "unknown_PLPresent" = {PLPresent=1;}
} : dump; } : dump;

2
definitions/grib2/tables/local/kwbc/1/3.1.table Normal file
View File

@ -0,0 +1,2 @@
# Code table 3.1 - Grid definition template number (NCEP local)
32769 32769 Rotate Latitude/Longitude (Arakawa Non-E Staggered grid)

2
fortran/CMakeLists.txt
View File

@ -49,7 +49,7 @@ if( HAVE_FORTRAN )
GENERATED grib_f90.f90 eccodes_f90.f90 GENERATED grib_f90.f90 eccodes_f90.f90
PUBLIC_INCLUDES $<BUILD_INTERFACE:${CMAKE_Fortran_MODULE_DIRECTORY}> PUBLIC_INCLUDES $<BUILD_INTERFACE:${CMAKE_Fortran_MODULE_DIRECTORY}>
$<INSTALL_INTERFACE:${INSTALL_INCLUDE_DIR}> $<INSTALL_INTERFACE:${INSTALL_INCLUDE_DIR}>
PRIVATE_LIBS eccodes ) PRIVATE_LIBS eccodes ${ECCODES_PTHREADS_LIBRARIES} )
if( DEFINED ecbuild_VERSION AND NOT ${ecbuild_VERSION} VERSION_LESS 3.1 ) if( DEFINED ecbuild_VERSION AND NOT ${ecbuild_VERSION} VERSION_LESS 3.1 )
# Installed module directory is not in the PUBLIC INCLUDES! # Installed module directory is not in the PUBLIC INCLUDES!

6
src/grib_accessor_class_bufr_data_array.c
View File

@ -667,7 +667,7 @@ static grib_darray* decode_double_array(grib_context* c, unsigned char* data, lo
} }
for (j = 0; j < self->numberOfSubsets; j++) { for (j = 0; j < self->numberOfSubsets; j++) {
lval = grib_decode_size_t(data, pos, localWidth); lval = grib_decode_size_t(data, pos, localWidth);
if (grib_is_all_bits_one(lval, localWidth) && canBeMissing) { if (canBeMissing && grib_is_all_bits_one(lval, localWidth)) {
dval = GRIB_MISSING_DOUBLE; dval = GRIB_MISSING_DOUBLE;
} }
else { else {
@ -678,7 +678,7 @@ static grib_darray* decode_double_array(grib_context* c, unsigned char* data, lo
} }
else { else {
/* ECC-428 */ /* ECC-428 */
if (grib_is_all_bits_one(lval, modifiedWidth) && canBeMissing) { if (canBeMissing && grib_is_all_bits_one(lval, modifiedWidth)) {
dval = GRIB_MISSING_DOUBLE; dval = GRIB_MISSING_DOUBLE;
} }
else { else {
@ -1096,7 +1096,7 @@ static double decode_double_value(grib_context* c, unsigned char* data, long* po
} }
lval = grib_decode_size_t(data, pos, modifiedWidth); lval = grib_decode_size_t(data, pos, modifiedWidth);
if (grib_is_all_bits_one(lval, modifiedWidth) && canBeMissing) { if (canBeMissing && grib_is_all_bits_one(lval, modifiedWidth)) {
dval = GRIB_MISSING_DOUBLE; dval = GRIB_MISSING_DOUBLE;
} }
else { else {

2
src/grib_bufr_descriptors_array.c
View File

@ -93,7 +93,7 @@ static bufr_descriptors_array* grib_bufr_descriptors_array_resize_to(bufr_descri
static bufr_descriptors_array* grib_bufr_descriptors_array_resize(bufr_descriptors_array* v) static bufr_descriptors_array* grib_bufr_descriptors_array_resize(bufr_descriptors_array* v)
{ {
const int newsize = v->incsize + v->size; const size_t newsize = v->incsize + v->size;
return grib_bufr_descriptors_array_resize_to(v, newsize); return grib_bufr_descriptors_array_resize_to(v, newsize);
} }

2
src/grib_iarray.c
View File

@ -126,7 +126,7 @@ static grib_iarray* grib_iarray_resize_to(grib_iarray* v, size_t newsize)
static grib_iarray* grib_iarray_resize(grib_iarray* v) static grib_iarray* grib_iarray_resize(grib_iarray* v)
{ {
const int newsize = v->incsize + v->size; const size_t newsize = v->incsize + v->size;
return grib_iarray_resize_to(v, newsize); return grib_iarray_resize_to(v, newsize);
} }

1
tests/CMakeLists.txt
View File

@ -88,6 +88,7 @@ if( HAVE_BUILD_TOOLS )
grib_ecc-1258 grib_ecc-1258
grib_ecc-1260 grib_ecc-1260
grib_ecc-1261 grib_ecc-1261
grib_ecc-1271
bufr_ecc-1028 bufr_ecc-1028
bufr_ecc-1195 bufr_ecc-1195
bufr_ecc-1259 bufr_ecc-1259

28
tests/grib_ecc-1271.sh Executable file
View File

@ -0,0 +1,28 @@
#!/bin/sh
# (C) Copyright 2005- ECMWF.
#
# This software is licensed under the terms of the Apache Licence Version 2.0
# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
#
# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
#
. ./include.sh
label="grib_ecc-1271-test"
temp=temp.$label
sample_grib2=$ECCODES_SAMPLES_PATH/GRIB2.tmpl
${tools_dir}/grib_set -s \
centre=kwbc,gridDefinitionTemplateNumber=32769,localTablesVersion=1 \
$sample_grib2 $temp
grib_check_key_equals $temp Ni,Nj "16 31"
grib_check_key_equals $temp centreLatitudeInDegrees,centreLongitudeInDegrees "0 30"
grib_check_key_equals $temp minimum,maximum "1 1"
rm -f $temp

4
tests/grib_efas.sh
View File

@ -104,6 +104,10 @@ grib_check_key_equals $temp2 mars.hdate,mars.date '20070323 20191213'
anoffset=`${tools_dir}/grib_get -f -p mars.anoffset $temp2` anoffset=`${tools_dir}/grib_get -f -p mars.anoffset $temp2`
[ "$anoffset" = "not_found" ] [ "$anoffset" = "not_found" ]
# ECC-1264
${tools_dir}/grib_set -s localDefinitionNumber=41,yearOfForecast=missing,monthOfForecast=missing $temp1 $temp2
#${tools_dir}/grib_dump -O $temp2
# Clean up # Clean up
rm -f $sample $temp1 $temp2 $temp3 rm -f $sample $temp1 $temp2 $temp3

24
tools/grib_repair.c
View File

@ -10,6 +10,8 @@
#include "grib_api_internal.h" #include "grib_api_internal.h"
static const char* ENV_VAR = "ECCODES_GRIB_REPAIR_MAX_NUM_MESSAGES";
static void usage(const char* name) static void usage(const char* name)
{ {
fprintf(stderr, "Usage: %s in out [bad]\n", name); fprintf(stderr, "Usage: %s in out [bad]\n", name);
@ -25,8 +27,10 @@ int main(int argc, char** argv)
char *cout, *cbad; char *cout, *cbad;
size_t data_len = SIZE; size_t data_len = SIZE;
long count = 0; unsigned long count = 0;
unsigned long MAX_NUM_MESSAGES = 100*1000;
unsigned char* data; unsigned char* data;
char* sMaxNumMessages = NULL;
if (argc != 3 && argc != 4) if (argc != 3 && argc != 4)
usage(argv[0]); usage(argv[0]);
@ -57,13 +61,27 @@ int main(int argc, char** argv)
cbad = cout; cbad = cout;
} }
sMaxNumMessages = getenv(ENV_VAR);
if (sMaxNumMessages) {
long lmax = 0;
if (string_to_long(sMaxNumMessages, &lmax) == GRIB_SUCCESS) {
MAX_NUM_MESSAGES = lmax;
}
}
for (;;) { for (;;) {
size_t len = SIZE; size_t len = SIZE;
long ret = wmo_read_grib_from_file(in, buffer, &len); long ret = wmo_read_grib_from_file(in, buffer, &len);
if (ret == GRIB_END_OF_FILE && len == 0) if (ret == GRIB_END_OF_FILE && len == 0)
break; break;
if (count > MAX_NUM_MESSAGES) {
/* ECC-1265 */
printf("\nExceeded the maximum number of messages. Limit = %lu.\n", MAX_NUM_MESSAGES);
printf("This limit can be overridden by setting the environment variable %s.\n", ENV_VAR);
break;
}
printf("GRIB %ld: size: %ld code: %ld (%s)\n", ++count, (long)len, ret, grib_get_error_message(ret)); printf("GRIB %lu: size: %ld code: %ld (%s)\n", ++count, (long)len, ret, grib_get_error_message(ret));
switch (ret) { switch (ret) {
case 0: case 0:
@ -80,7 +98,7 @@ int main(int argc, char** argv)
len = data_len = SIZE; len = data_len = SIZE;
data = (unsigned char*)&buffer[0]; data = (unsigned char*)&buffer[0];
ret = grib_read_any_from_memory(NULL, &data, &data_len, buffer, &len); ret = grib_read_any_from_memory(NULL, &data, &data_len, buffer, &len);
printf(" -> GRIB %ld: size: %ld code: %ld (%s)\n", count, (long)len, ret, grib_get_error_message(ret)); printf(" -> GRIB %lu: size: %ld code: %ld (%s)\n", count, (long)len, ret, grib_get_error_message(ret));
if (ret == 0) { if (ret == 0) {
if (fwrite(buffer, 1, len, bad) != len) { if (fwrite(buffer, 1, len, bad) != len) {
perror(cbad); perror(cbad);