Skip to content

Commit

Permalink
Merge branch 'develop' into feature/eckit-geo-bundle
Browse files Browse the repository at this point in the history
  • Loading branch information
@pmaciel
pmaciel committed May 9, 2024
2 parents ab16aad + d6562dd commit 6bcc845
Show file tree
Hide file tree
Showing 1,679 changed files with 27,899 additions and 13,728 deletions.
11 changes: 1 addition & 10 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ jobs:
uses: ecmwf-actions/downstream-ci/.github/workflows/downstream-ci.yml@main
with:
eccodes: ecmwf/eccodes@${{ github.event.pull_request.head.sha || github.sha }}
codecov_upload: true
secrets: inherit

# Run CI of private downstream packages on self-hosted runners
Expand Down Expand Up @@ -74,23 +75,13 @@ jobs:
event_type: downstream-ci-hpc
payload: '{"eccodes": "ecmwf/eccodes@${{ github.event.pull_request.head.sha || github.sha }}"}'

codecov:
name: code-coverage
if: ${{ !github.event.pull_request.head.repo.fork && github.event.action != 'labeled' || github.event.label.name == 'approved-for-ci' }}
uses: ./.github/workflows/reusable-ci.yml
with:
eccodes: ecmwf/eccodes@${{ github.event.pull_request.head.sha || github.sha }}
codecov: true
secrets: inherit

notify:
runs-on: ubuntu-latest
needs:
- downstream-ci
- private-downstream-ci
- downstream-ci-hpc
- private-downstream-ci-hpc
- codecov
if: always() && ${{ !github.event.pull_request.head.repo.fork && github.event.action != 'labeled' || github.event.label.name == 'approved-for-ci' }}
steps:
- name: Trigger Teams notification
Expand Down
2 changes: 0 additions & 2 deletions INSTALL
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ However it requires that cmake be installed on your system.

To add the Python3 bindings, use pip3 install from PyPI as follows:
> pip3 install eccodes
or
> pip3 install --install-option="--prefix=/path/to/where/you/install/eccodes" eccodes

You can also pass options to the cmake command above. Some typical examples are:

Expand Down
7 changes: 1 addition & 6 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ INSTALLATION
```
cmake ../eccodes-x.y.z-Source -DCMAKE_INSTALL_PREFIX=/path/to/where/you/install/eccodes
```

It is strongly recommended that you install into a clean directory

5. Compile, test and install:
Expand All @@ -60,11 +60,6 @@ To add the Python3 bindings, use pip3 install from PyPI as follows:
```
pip3 install eccodes
```
or
```
pip3 install --install-option="--prefix=/path/to/where/you/install/eccodes" eccodes
```


For more details, please see:
https://confluence.ecmwf.int/display/ECC/ecCodes+installation
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.35.0
2.36.0
2 changes: 1 addition & 1 deletion definitions/bufr/section.3.def
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ unsigned[2] numberOfSubsets : dump;
alias ls.numberOfSubsets=numberOfSubsets;

if (section2Present && bufrHeaderCentre==98 && section2Length==52) {
if ( rdbType == 2 || rdbType == 3 || rdbType == 8 || rdbType == 12 ) {
if ( rdbType == 2 || rdbType == 3 || rdbType == 8 || rdbType == 12 || rdbType == 30 ) {
transient isSatelliteType=1;
} else {
transient isSatelliteType=0;
Expand Down
1 change: 1 addition & 0 deletions definitions/check_grib_defs.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ sub process {
}
elsif ($this =~ /'(.*)' *= *{/) {
$concept = $1;
die "File: $filename, line: $lineNum: Value is empty." if ($concept eq '');
die "File: $filename, line: $lineNum: Value contains invalid characters." if (non_printable($concept));
if ($filename eq 'cfVarName.def') {
#if ($concept =~ /^[0-9]/) {
Expand Down
30 changes: 0 additions & 30 deletions definitions/grib1/cfVarName.def
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1148,36 +1148,6 @@
table2Version = 1 ;
indicatorOfParameter = 48 ;
}
#U-component of current
'ucurr' = {
table2Version = 3 ;
indicatorOfParameter = 49 ;
}
#U-component of current
'ucurr' = {
table2Version = 2 ;
indicatorOfParameter = 49 ;
}
#U-component of current
'ucurr' = {
table2Version = 1 ;
indicatorOfParameter = 49 ;
}
#V-component of current
'vcurr' = {
table2Version = 3 ;
indicatorOfParameter = 50 ;
}
#V-component of current
'vcurr' = {
table2Version = 2 ;
indicatorOfParameter = 50 ;
}
#V-component of current
'vcurr' = {
table2Version = 1 ;
indicatorOfParameter = 50 ;
}
#Humidity mixing ratio
'mixr' = {
table2Version = 3 ;
Expand Down
4 changes: 2 additions & 2 deletions definitions/grib1/localConcepts/ecmf/cfName.def
View file
Original file line number Diff line number Diff line change
Expand Up @@ -909,12 +909,12 @@
table2Version = 151 ;
indicatorOfParameter = 130 ;
}
#Eastward sea water velocity
#Eastward surface sea water velocity
'eastward_sea_water_velocity' = {
table2Version = 151 ;
indicatorOfParameter = 131 ;
}
#Northward sea water velocity
#Northward surface sea water velocity
'northward_sea_water_velocity' = {
table2Version = 151 ;
indicatorOfParameter = 132 ;
Expand Down
8 changes: 4 additions & 4 deletions definitions/grib1/localConcepts/ecmf/cfVarName.def
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12659,7 +12659,7 @@
table2Version = 140 ;
indicatorOfParameter = 217 ;
}
#Maximum individual wave height
#Envelop-maximum individual wave height
'hmax' = {
table2Version = 140 ;
indicatorOfParameter = 218 ;
Expand Down Expand Up @@ -13024,12 +13024,12 @@
table2Version = 151 ;
indicatorOfParameter = 130 ;
}
#Eastward sea water velocity
#Eastward surface sea water velocity
'uoe' = {
table2Version = 151 ;
indicatorOfParameter = 131 ;
}
#Northward sea water velocity
#Northward surface sea water velocity
'von' = {
table2Version = 151 ;
indicatorOfParameter = 132 ;
Expand Down Expand Up @@ -13244,7 +13244,7 @@
table2Version = 151 ;
indicatorOfParameter = 174 ;
}
#Average salinity in the upper 300m
#Average sea water practical salinity in the upper 300m
'sav300' = {
table2Version = 151 ;
indicatorOfParameter = 175 ;
Expand Down
16 changes: 8 additions & 8 deletions definitions/grib1/localConcepts/ecmf/name.def
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12659,8 +12659,8 @@
table2Version = 140 ;
indicatorOfParameter = 217 ;
}
#Maximum individual wave height
'Maximum individual wave height' = {
#Envelop-maximum individual wave height
'Envelop-maximum individual wave height' = {
table2Version = 140 ;
indicatorOfParameter = 218 ;
}
Expand Down Expand Up @@ -13024,13 +13024,13 @@
table2Version = 151 ;
indicatorOfParameter = 130 ;
}
#Eastward sea water velocity
'Eastward sea water velocity' = {
#Eastward surface sea water velocity
'Eastward surface sea water velocity' = {
table2Version = 151 ;
indicatorOfParameter = 131 ;
}
#Northward sea water velocity
'Northward sea water velocity' = {
#Northward surface sea water velocity
'Northward surface sea water velocity' = {
table2Version = 151 ;
indicatorOfParameter = 132 ;
}
Expand Down Expand Up @@ -13244,8 +13244,8 @@
table2Version = 151 ;
indicatorOfParameter = 174 ;
}
#Average salinity in the upper 300m
'Average salinity in the upper 300m' = {
#Average sea water practical salinity in the upper 300m
'Average sea water practical salinity in the upper 300m' = {
table2Version = 151 ;
indicatorOfParameter = 175 ;
}
Expand Down
8 changes: 4 additions & 4 deletions definitions/grib1/localConcepts/ecmf/paramId.def
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12659,7 +12659,7 @@
table2Version = 140 ;
indicatorOfParameter = 217 ;
}
#Maximum individual wave height
#Envelop-maximum individual wave height
'140218' = {
table2Version = 140 ;
indicatorOfParameter = 218 ;
Expand Down Expand Up @@ -13024,12 +13024,12 @@
table2Version = 151 ;
indicatorOfParameter = 130 ;
}
#Eastward sea water velocity
#Eastward surface sea water velocity
'151131' = {
table2Version = 151 ;
indicatorOfParameter = 131 ;
}
#Northward sea water velocity
#Northward surface sea water velocity
'151132' = {
table2Version = 151 ;
indicatorOfParameter = 132 ;
Expand Down Expand Up @@ -13244,7 +13244,7 @@
table2Version = 151 ;
indicatorOfParameter = 174 ;
}
#Average salinity in the upper 300m
#Average sea water practical salinity in the upper 300m
'151175' = {
table2Version = 151 ;
indicatorOfParameter = 175 ;
Expand Down
37 changes: 37 additions & 0 deletions definitions/grib1/localConcepts/ecmf/paramIdForConversion.def
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# Concept paramIdForConversion for ECMWF
# See ECC-1806

# 55
228004 = {gribTablesVersionNo=128; indicatorOfParameter=55; centre=98;}
# 56
235168 = {gribTablesVersionNo=128; indicatorOfParameter=56; centre=98;}
# 130232
235135 = {gribTablesVersionNo=130; indicatorOfParameter=232; centre=98;}
# 151163
262104 = {gribTablesVersionNo=151; indicatorOfParameter=163; centre=98;}
# 151145
262124 = {gribTablesVersionNo=151; indicatorOfParameter=145; centre=98;}
# 172146
235033 = {gribTablesVersionNo=172; indicatorOfParameter=146; centre=98;}
# 172147
235034 = {gribTablesVersionNo=172; indicatorOfParameter=147; centre=98;}
# 172169
235035 = {gribTablesVersionNo=172; indicatorOfParameter=169; centre=98;}
# 172175
235036 = {gribTablesVersionNo=172; indicatorOfParameter=175; centre=98;}
# 172176
235037 = {gribTablesVersionNo=172; indicatorOfParameter=176; centre=98;}
# 172177
235038 = {gribTablesVersionNo=172; indicatorOfParameter=177; centre=98;}
# 172178
235039 = {gribTablesVersionNo=172; indicatorOfParameter=178; centre=98;}
# 172179
235040 = {gribTablesVersionNo=172; indicatorOfParameter=179; centre=98;}
# 174098
262000 = {gribTablesVersionNo=174; indicatorOfParameter=98; centre=98;}
# 151175
262118 = {gribTablesVersionNo=151; indicatorOfParameter=175; centre=98;}
# 151132
262139 = {gribTablesVersionNo=151; indicatorOfParameter=132; centre=98;}
# 151131
262140 = {gribTablesVersionNo=151; indicatorOfParameter=131; centre=98;}
8 changes: 4 additions & 4 deletions definitions/grib1/localConcepts/ecmf/shortName.def
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12659,7 +12659,7 @@
table2Version = 140 ;
indicatorOfParameter = 217 ;
}
#Maximum individual wave height
#Envelop-maximum individual wave height
'hmax' = {
table2Version = 140 ;
indicatorOfParameter = 218 ;
Expand Down Expand Up @@ -13024,12 +13024,12 @@
table2Version = 151 ;
indicatorOfParameter = 130 ;
}
#Eastward sea water velocity
#Eastward surface sea water velocity
'ocu' = {
table2Version = 151 ;
indicatorOfParameter = 131 ;
}
#Northward sea water velocity
#Northward surface sea water velocity
'ocv' = {
table2Version = 151 ;
indicatorOfParameter = 132 ;
Expand Down Expand Up @@ -13244,7 +13244,7 @@
table2Version = 151 ;
indicatorOfParameter = 174 ;
}
#Average salinity in the upper 300m
#Average sea water practical salinity in the upper 300m
'sav300' = {
table2Version = 151 ;
indicatorOfParameter = 175 ;
Expand Down
Loading

0 comments on commit 6bcc845

Please sign in to comment.