Skip to content

Commit 597e8fd

Browse files
committed
Merge branch 'release/2.42.0'
2 parents 24a214d + 52cdf2e commit 597e8fd

File tree

1,199 files changed

+383078
-53457
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,199 files changed

+383078
-53457
lines changed

.github/ci-config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencies: |
22
ecmwf/ecbuild
3-
MathisRosenhauer/libaec@master
3+
MathisRosenhauer/libaec@refs/tags/v1.1.3
44
dependency_branch: develop
55
parallelism_factor: 8

.github/ci-nightly-test.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,14 @@ git clone https://${GH_TOKEN}@github.com/ecmwf/eccodes-regression-tests.git $reg
2424
cd $regression_suite_dir
2525

2626
# Launch the regression tests in parallel (This script uses GNU parallel)
27-
# cd ~masn/REGRESSION_TESTING/ecCodes
27+
echo "Running ./par-suite.sh -w $TMPDIR/install/eccodes/$version"
2828
./par-suite.sh -w $TMPDIR/install/eccodes/$version
2929

30+
# Parallel tests succeeded
31+
# We should ideally run performance tests MULTIPLE times
32+
echo "Running ./seq-suite.sh -w $TMPDIR/install/eccodes/$version -t PERFORMANCE"
33+
./seq-suite.sh -w $TMPDIR/install/eccodes/$version -t PERFORMANCE
34+
35+
3036
# For debugging specific test(s)
3137
# ./seq-suite.sh -w $TMPDIR/install/eccodes/$version -d -t $test_name

.github/workflows/build-wheel-wrapper.yml

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,27 @@ name: Build Python Wrapper Wheel
1111

1212
on:
1313
# Trigger the workflow manually
14-
workflow_dispatch: ~
14+
workflow_dispatch:
15+
inputs:
16+
use_test_pypi:
17+
description: Use test pypi instead of the regular one
18+
required: false
19+
type: boolean
20+
default: false
1521

16-
# Allow to be called from another workflow
17-
workflow_call: ~
18-
19-
# TODO automation trigger
22+
# Allow to be called from another workflow -- eg `cd.yml`
23+
workflow_call:
24+
inputs:
25+
use_test_pypi:
26+
description: Use test pypi instead of the regular one
27+
required: false
28+
type: boolean
29+
default: false
2030

2131
jobs:
2232
python-wrapper-wheel:
2333
name: Python Wrapper Wheel
2434
uses: ecmwf/reusable-workflows/.github/workflows/python-wrapper-wheel.yml@main
2535
secrets: inherit
36+
with:
37+
use_test_pypi: ${{ inputs.use_test_pypi }}

.github/workflows/cd.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,6 @@ jobs:
99
deploy:
1010
uses: ecmwf/reusable-workflows/.github/workflows/create-package.yml@v2
1111
secrets: inherit
12+
wheel:
13+
uses: ./.github/workflows/build-wheel-wrapper.yml
14+
secrets: inherit

CMakeLists.txt

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ if(NOT DEFINED ENABLE_AEC AND NOT AEC_FOUND)
163163
"\nTo force the build without it, use -DENABLE_AEC=OFF")
164164
endif()
165165
ecbuild_add_option( FEATURE AEC
166-
DESCRIPTION "Support for Adaptive Entropy Coding"
166+
DESCRIPTION "Support for Adaptive Entropy Coding (WMO GRIB CCSDS)"
167167
DEFAULT ON
168168
CONDITION AEC_FOUND )
169169

@@ -219,7 +219,6 @@ ecbuild_add_option( FEATURE INSTALL_ECCODES_SAMPLES
219219

220220
ecbuild_add_option( FEATURE MEMORY_MANAGEMENT DESCRIPTION "Enable memory management" DEFAULT OFF ADVANCED )
221221
ecbuild_add_option( FEATURE ALIGN_MEMORY DESCRIPTION "Enable memory alignment" DEFAULT OFF ADVANCED )
222-
ecbuild_add_option( FEATURE TIMER DESCRIPTION "Enable timer (deprecated)" DEFAULT OFF ADVANCED )
223222
ecbuild_add_option( FEATURE ECCODES_THREADS DESCRIPTION "Enable thread-safety using POSIX threads" DEFAULT OFF ADVANCED )
224223
ecbuild_add_option( FEATURE ECCODES_OMP_THREADS DESCRIPTION "Enable thread-safety using OpenMP threads" DEFAULT OFF ADVANCED )
225224
ecbuild_add_option( FEATURE EXTRA_TESTS DESCRIPTION "Enable extended regression testing" DEFAULT OFF ADVANCED )
@@ -385,8 +384,9 @@ configure_file( eccodes_config.h.in eccodes_config.h )
385384

386385
add_definitions( -DHAVE_ECCODES_CONFIG_H )
387386

388-
if( CMAKE_COMPILER_IS_GNUCC )
387+
if( CMAKE_CXX_COMPILER_ID STREQUAL "GNU" )
389388
ecbuild_add_c_flags("-pedantic")
389+
ecbuild_add_cxx_flags("-pedantic")
390390
endif()
391391
if( CMAKE_CXX_COMPILER_ID MATCHES IntelLLVM )
392392
# Turn off -ffinite-math-only which gets included by some optimisation levels which assume values can never be NaN.
@@ -470,7 +470,7 @@ add_subdirectory( samples )
470470
add_subdirectory( ifs_samples ) # must come after samples
471471

472472
# ecbuild_dont_pack( DIRS samples DONT_PACK_REGEX "*.grib" )
473-
ecbuild_dont_pack( FILES .cproject .project )
473+
ecbuild_dont_pack( FILES .cproject .project eccodes.code-workspace )
474474
ecbuild_dont_pack( DIRS
475475
experimental deprecated doxygen confluence tests/deprecated tests/tests.ecmwf
476476
src/eccodes/deprecated tools/deprecated ifs_samples/grib1_mlgrib2_ieee32
@@ -518,11 +518,11 @@ if( HAVE_FORTRAN )
518518
endif()
519519

520520
###############################################################################
521-
# Debugging aid. Print all known CMake variables
522-
#get_cmake_property(_variableNames VARIABLES)
523-
#foreach( _variableName ${_variableNames} )
521+
# Debugging aid. Print all known CMake variables:
522+
# get_cmake_property(_variableNames VARIABLES)
523+
# foreach( _variableName ${_variableNames} )
524524
# ecbuild_info(" ${_variableName}=${${_variableName}}")
525-
#endforeach()
525+
# endforeach()
526526
###############################################################################
527527
# finalize
528528

@@ -536,15 +536,6 @@ ecbuild_info(" | ecCodes version ${eccodes_VERSION} |")
536536
ecbuild_info(" +--------------------------+")
537537
ecbuild_info("")
538538

539-
ecbuild_info("Please note:")
540-
ecbuild_info(" For Python3 support, you must install the Python bindings.")
541-
ecbuild_info(" See:")
539+
ecbuild_info("For further installation instructions, please see:")
542540
ecbuild_info(" https://confluence.ecmwf.int/display/ECC/ecCodes+installation")
543541
ecbuild_info("")
544-
545-
if( HAVE_TIMER )
546-
ecbuild_deprecate( "Option ENABLE_TIMER is ignored and will be removed in a future release." )
547-
set( ECCODES_TIMER 1 )
548-
else()
549-
set( ECCODES_TIMER 0 )
550-
endif()

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.41.0
1+
2.42.0

definitions/bufr/boot.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ transient setToMissingIfOutOfRange=0 : hidden;
1313

1414
# This gets updated twice a year by WMO.
1515
# See https://community.wmo.int/en/wis/latest-version
16-
constant masterTablesVersionNumberLatest = 43;
16+
constant masterTablesVersionNumberLatest = 44;
1717

1818
#negative value=not used
1919
transient inputDelayedDescriptorReplicationFactor={-1} : hidden;
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
0 0 ANTARCTICA
2+
1 1 REGION I
3+
2 2 REGION II
4+
3 3 REGION III
5+
4 4 REGION IV
6+
5 5 REGION V
7+
6 6 REGION VI
8+
7 7 MISSING VALUE
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
0 0 INCREASING, THEN DECREASING; ATMOSPHERIC PRESSURE THE SAME OR HIGHER THAN THREE HOURS AGO
2+
1 1 INCREASING, THEN STEADY; OR INCREASING, THEN INCREASING MORE SLOWLY
3+
2 2 INCREASING (STEADILY OR UNSTEADILY)
4+
3 3 DECREASING OR STEADY, THEN INCREASING; OR INCREASING, THEN INCREASING MORE RAPIDLY
5+
4 4 STEADY; ATMOSPHERIC PRESSURE THE SAME AS THREE HOURS AGO
6+
5 5 DECREASING, THEN INCREASING; ATMOSPHERIC PRESSURE THE SAME OR LOWER THAN THREE HOURS AGO
7+
6 6 DECREASING, THEN STEADY; OR DECREASING, THEN DECREASING MORE SLOWLY
8+
7 7 DECREASING (STEADILY OR UNSTEADILY)
9+
8 8 STEADY OR INCREASING, THEN DECREASING; OR DECREASING, THEN DECREASING MORE RAPIDLY
10+
15 15 MISSING VALUE
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
0 0 SUBSONIC
2+
1 1 TRANSONIC
3+
2 2 SUPERSONIC
4+
7 7 MISSING VALUE

0 commit comments

Comments
 (0)