Merge release to master

Author: joobog

.github/ci-hpc-config.yml

@@ -1,6 +1,6 @@
 build:
   modules:
-    - ecbuild
+    - ecbuild/new
     - ninja
     - aec
     - netcdf4

.github/nightly-ci-eckit-geo-hpc-config.yml

@@ -0,0 +1,19 @@
+build:
+  modules:
+    - ecbuild/new
+    - ninja
+    - aec
+    - netcdf4
+  parallel: 64
+  dependencies:
+    - ecmwf/eckit@feature/eckit-geo
+  dependency_branch: feature/eckit-geo
+  cmake_options:
+    - -DENABLE_ECKIT_GEO=1
+    - -DENABLE_EXTRA_TESTS=1
+  force_build: true
+  env:
+    - ECCODES_ECKIT_GEO=1
+  compiler_cc: gcc
+  compiler_cxx: g++
+  compiler_fc: gfortran

.github/nightly-ci-hpc-config.yml

@@ -1,6 +1,6 @@
 build:
   modules:
-    - ecbuild
+    - ecbuild/new
     - ninja
     - aec
     - netcdf4

.github/workflows/nightly-eckit-geo.yml

@@ -0,0 +1,23 @@
+name: nightly-eckit-geo
+
+on:
+  workflow_dispatch: ~
+
+  # Run at 21:00 UTC every day (on default branch)
+  schedule:
+    - cron: "0 21 * * *"
+
+jobs:
+  test-hpc:
+    runs-on: [self-hosted, linux, hpc]
+    env:
+      GH_TOKEN: ${{ secrets.GH_REPO_READ_TOKEN }}
+    steps:
+      - uses: ecmwf/reusable-workflows/ci-hpc@v2
+        with:
+          github_user: ${{ secrets.BUILD_PACKAGE_HPC_GITHUB_USER }}
+          github_token: ${{ secrets.GH_REPO_READ_TOKEN }}
+          troika_user: ${{ secrets.HPC_TEST_USER }}
+          # repository: ecmwf/eccodes@${{ github.event.pull_request.head.sha || github.sha }}
+          repository: ecmwf/eccodes@feature/eckit-geo
+          build_config: .github/nightly-ci-eckit-geo-hpc-config.yml

.github/workflows/notify_new_pr.yml

@@ -10,6 +10,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Notify new PR
-        uses: ecmwf-actions/notify-teams-pr@v1
+        uses: ecmwf/notify-teams-pr@v1
         with:
           incoming_webhook: ${{ secrets.MS_TEAMS_INCOMING_WEBHOOK }}

CMakeLists.txt

@@ -24,7 +24,7 @@ if(NOT ecbuild_FOUND)
     include(FetchContent)
     FetchContent_Populate(ecbuild
         GIT_REPOSITORY https://github.com/ecmwf/ecbuild.git
-        GIT_TAG        3.8.5
+        GIT_TAG        3.12.0
     )
     find_package( ecbuild 3.7 REQUIRED HINTS ${ecbuild_SOURCE_DIR})
 endif()
@@ -155,8 +155,8 @@ ecbuild_add_option( FEATURE NETCDF
     REQUIRED_PACKAGES NetCDF
     NO_TPL )
 
-find_package( AEC )
-if(NOT DEFINED ENABLE_AEC AND NOT AEC_FOUND)
+find_package( libaec 1.0.6 )
+if(NOT DEFINED ENABLE_AEC AND NOT libaec_FOUND)
   ecbuild_critical("AEC library was not found.\n"
                    "AEC (Adaptive Entropy Coding) provides the WMO GRIB CCSDS compression and decompression of data. "
                    "This is highly recommended from ecCodes >= 2.25.0"
@@ -165,7 +165,7 @@ endif()
 ecbuild_add_option( FEATURE AEC
     DESCRIPTION "Support for Adaptive Entropy Coding (WMO GRIB CCSDS)"
     DEFAULT ON
-    CONDITION AEC_FOUND )
+    CONDITION libaec_FOUND )
 
 ecbuild_find_python( VERSION 3.6 NO_LIBS )
 # find_package( NumPy )

VERSION

@@ -1 +1 @@
-2.44.2
+2.45.0

bamboo/flags.cmake

@@ -1,5 +1,8 @@
+# SET(ENABLE_AEC                  OFF CACHE BOOL "Disable CCSDS for Bamboo")
 SET(ENABLE_EXTRA_TESTS          ON  CACHE BOOL "Enable extra tests")
 SET(ECCODES_INSTALL_EXTRA_TOOLS ON  CACHE BOOL "Install extra tools")
 SET(ENABLE_ECCODES_THREADS      ON  CACHE BOOL "Enable POSIX threads")
 SET(ENABLE_MEMFS                ON  CACHE BOOL "Enable MEMFS")
 # SET(ENABLE_JPG_LIBOPENJPEG OFF CACHE BOOL "Disable OpenJPEG")
+# SET(ECBUILD_LOG_LEVEL          "DEBUG" CACHE STRING "ecbuild debug level")
+# SET(libaec_USE_STATIC_LIBS      ON  CACHE BOOL "Use AEC static lib")

definitions/boot.def

@@ -125,3 +125,5 @@ if(kindOfProduct == `WRAP`){
  constant WRAPstr="WRAP";
  alias ls.identifier=WRAPstr;
 }
+
+include "boot_extra.def";

definitions/boot_extra.def

@@ -0,0 +1,20 @@
+# Override this file to add your own additional definitions.
+# e.g., check for ecCodes library version compatibility
+
+# meta ecmwfLibraryVersion library_version() : string_type, hidden, read_only;
+# 
+# concept isCompatible(unknown) {
+#     'yes' = { true=is_one_of(ecmwfLibraryVersion, '2.45.0', '2.44.0' ); }
+#     'no' = { ecmwfLibraryVersion = '2.43.0'; }
+# } : string_type, hidden, read_only;
+# 
+# if (isCompatible is 'unknown') {
+#     print("/dev/stderr") "WARNING: ecCodes [ecmwfLibraryVersion] compatibility could not be determined. Please make sure ECCODES_DEFINITION_PATH environment variable is set correctly.";
+# }
+# 
+# if (isCompatible is 'no') {
+#     print("/dev/stderr") "ERROR: ecCodes [ecmwfLibraryVersion] is NOT compatible with loaded definitions. Please make sure ECCODES_DEFINITION_PATH environment variable is set correctly.";
+#     assert(0 && "Quitting ...");
+# }
+#
+# Please note: print("/dev/stderr") "..." may not work on Windows systems. Please use print "..." instead.