Hirlam · benjaminmenetrier · Apr 15, 2024 · Apr 15, 2024 · Apr 15, 2024 · Mar 27, 2024
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -73,3 +73,20 @@ jobs:
           repository: private-downstream-ci
           event_type: downstream-ci-hpc
           payload: '{"atlas": "ecmwf/atlas@${{ github.event.pull_request.head.sha || github.sha }}"}'
+
+
+  notify:
+    runs-on: ubuntu-latest
+    needs:
+      - downstream-ci
+      - private-downstream-ci
+      - downstream-ci-hpc
+      - private-downstream-ci-hpc
+    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
+        uses: ecmwf-actions/notify-teams@v1
+        with:
+          incoming_webhook: ${{ secrets.MS_TEAMS_INCOMING_WEBHOOK }}
+          needs_context: ${{ toJSON(needs) }}
+
diff --git a/.github/workflows/notify-new-issue.yml b/.github/workflows/notify-new-issue.yml
@@ -0,0 +1,15 @@
+name: Notify new issue
+
+on:
+  issues:
+    types:
+      - "opened"
+
+jobs:
+  notify:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Notify new issue
+        uses: ecmwf-actions/notify-teams-issue@v1
+        with:
+          incoming_webhook: ${{ secrets.MS_TEAMS_INCOMING_WEBHOOK }}
diff --git a/.github/workflows/notify-new-pr.yml b/.github/workflows/notify-new-pr.yml
@@ -0,0 +1,16 @@
+name: Notify new PR
+
+# Needs the worklow to be located in the branche the PR is merged to
+on:
+  pull_request_target:
+    types:
+      - "opened"
+
+jobs:
+  notify:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Notify new PR
+        uses: ecmwf-actions/notify-teams-pr@v1
+        with:
+          incoming_webhook: ${{ secrets.MS_TEAMS_INCOMING_WEBHOOK }}
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,5 @@ build/*
 install/*
 env.sh
 *.DS_Store
+.vscode
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,24 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 
 ## [Unreleased]
 
+## [0.38.0] - 2024-06-20
+
+### Added
+- Make non_linear interpolation independent of a chosen value type by @wdeconinck in https://github.com/ecmwf/atlas/pull/176
+- Procedure to carry out a regridding from high to low resolution (binning) by @mo-lormi in https://github.com/ecmwf/atlas/pull/191
+- Add Fortran interface for node-to-edge connectivity building by @benjaminmenetrier in https://github.com/ecmwf/atlas/pull/209
+- CUDA/OpenACC capable fields with Native storage backend  @sbrdar and @wdeconinck in https://github.com/ecmwf/atlas/pull/182
+
+### Changed
+- Make non_linear interpolation independent of a chosen value type by @wdeconinck in https://github.com/ecmwf/atlas/pull/176
+
+### Fixed
+- Remove float in Triag2D intersection algorithm by @fmahebert in https://github.com/ecmwf/atlas/pull/203
+- Allow zero-sized interpolation target functionspace by @odlomax in https://github.com/ecmwf/atlas/pull/206
+- Made sure cubed-sphere interpolation method always sets metadata. by @odlomax in https://github.com/ecmwf/atlas/pull/208
+- Avoid silent errors accessing Fieldset fields by ambiguous names by @wdeconinck in https://github.com/ecmwf/atlas/pull/210
+- Fixes opposite pole coordinates by @benjaminmenetrier in https://github.com/ecmwf/atlas/pull/202
+
 ## [0.37.0] - 2024-04-09
 ### Added
 - Add SphericalVector interpolation method using parallel transport (#163)
@@ -527,6 +545,7 @@ Fix StructuredInterpolation2D with retry for failed stencils
 ## 0.13.0 - 2018-02-16
 
 [Unreleased]: https://github.com/ecmwf/atlas/compare/master...develop
+[0.38.0]: https://github.com/ecmwf/atlas/compare/0.37.0...0.38.0
 [0.37.0]: https://github.com/ecmwf/atlas/compare/0.36.0...0.37.0
 [0.36.0]: https://github.com/ecmwf/atlas/compare/0.35.1...0.36.0
 [0.35.1]: https://github.com/ecmwf/atlas/compare/0.35.0...0.35.1

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -67,6 +67,7 @@ ecbuild_add_option( FEATURE ECKIT_DEVELOP
 
 include( features/BOUNDSCHECKING )
 include( features/FORTRAN )
+include( features/CUDA )
 include( features/MPI )
 include( features/OMP )
 include( features/FFTW )

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.37.0
+0.38.0
diff --git a/cmake/features/ACC.cmake b/cmake/features/ACC.cmake
@@ -15,7 +15,8 @@ ecbuild_add_option( FEATURE ACC
 
 if( atlas_HAVE_ACC )
   if( CMAKE_Fortran_COMPILER_ID MATCHES "PGI|NVHPC" )
-    set( ACC_Fortran_FLAGS -acc -ta=tesla,nordc )
+      #set( ACC_Fortran_FLAGS -acc -ta=tesla,nordc )
+    set( ACC_Fortran_FLAGS "-acc=gpu;-gpu=gvmode,lineinfo,fastmath,rdc" )
     set( ACC_C_FLAGS ${ACC_Fortran_FLAGS} )
     find_program( ACC_C_COMPILER NAMES pgcc HINTS ${PGI_DIR} ${NVPHC_DIR} ENV PGI_DIR NVHPC_DIR PATH_SUFFIXES bin )
     if( NOT ACC_C_COMPILER )
@@ -27,4 +28,5 @@ endif()
 else()
   set( HAVE_ACC 0 )
   set( atlas_HAVE_ACC 0 )
-endif()
+endif()
+
diff --git a/cmake/features/CUDA.cmake b/cmake/features/CUDA.cmake
@@ -0,0 +1,15 @@
+
+ecbuild_add_option( FEATURE CUDA
+                    DESCRIPTION "Enable CUDA support"
+                    DEFAULT OFF
+                  )
+
+if( HAVE_CUDA )
+
+    enable_language( CUDA )
+    ecbuild_info( "CUDA language enabled" )
+
+    find_package( CUDAToolkit REQUIRED )
+
+endif()
+
diff --git a/cmake/features/GRIDTOOLS_STORAGE.cmake b/cmake/features/GRIDTOOLS_STORAGE.cmake
@@ -1,4 +1,4 @@
-if( atlas_HAVE_ATLAS_FIELD )
+if( atlas_HAVE_ATLAS_FIELD AND (ENABLE_GRIDTOOLS_STORAGE OR atlas_ENABLE_GRIDTOOLS_STORAGE) )
 
 ### GridTools storage module
 
@@ -22,51 +22,28 @@ ecbuild_add_option(
   DESCRIPTION "Arrays internally use GridTools storage layer"
   CONDITION GridTools_FOUND )
 
-ecbuild_add_option( FEATURE CUDA
-                    DESCRIPTION "Enable CUDA support via GridTools CUDA backend"
-                    CONDITION GRIDTOOLS_HAS_BACKEND_CUDA )
-
 set( ATLAS_GRIDTOOLS_STORAGE_BACKEND_HOST 0 )
 set( ATLAS_GRIDTOOLS_STORAGE_BACKEND_CUDA 0 )
 
 if( atlas_HAVE_GRIDTOOLS_STORAGE )
-
-  if( atlas_HAVE_CUDA )
-
-    ecbuild_info( "GridTools found with CUDA support" )
-
-    # Logic to check if we can use enable_language( CUDA )
-    #   - CMake already supports it (as GridTools requires version that supports it)
-    #   - ecbuild version 3.3 added support
-    #   - overriding mechanism possible with cached "atlas_CUDA_LANGUAGE_ENABLED" variable
-    if( DEFINED ecbuild_VERSION AND NOT ecbuild_VERSION VERSION_LESS 3.3 )
-      set( atlas_CUDA_LANGUAGE_ENABLED_DEFAULT ON )
+  if( GRIDTOOLS_HAS_BACKEND_CUDA )
+    if( atlas_HAVE_CUDA )
+      ecbuild_info( "GridTools found with CUDA support -> backend CUDA" )
+      set( ATLAS_GRIDTOOLS_STORAGE_BACKEND_CUDA 1 )
     else()
-      set( atlas_CUDA_LANGUAGE_ENABLED_DEFAULT OFF )
+      ecbuild_info( "GridTools found with CUDA support, but atlas does not have CUDA enabled -> backend HOST" )
+      set( ATLAS_GRIDTOOLS_STORAGE_BACKEND_HOST 1 )
     endif()
-    set( atlas_CUDA_LANGUAGE_ENABLED ${atlas_CUDA_LANGUAGE_ENABLED_DEFAULT} CACHE BOOL "atlas enables CUDA language" )
-
-    if( atlas_CUDA_LANGUAGE_ENABLED )
-      enable_language( CUDA )
-      ecbuild_info( "CUDA language enabled" )
-    else()
-      ecbuild_info("CUDA enabled through find_package(CUDA) instead of enable_language(CUDA)")
-      find_package( CUDA )
-    endif()
-
-    set( ATLAS_GRIDTOOLS_STORAGE_BACKEND_CUDA 1 )
-
   else()
-
+    ecbuild_info( "GridTools found without CUDA support -> backend HOST" )
     set( ATLAS_GRIDTOOLS_STORAGE_BACKEND_HOST 1 )
-
   endif()
-
 endif()
 
 else()
-  set( HAVE_GRIDTOOLS_STORAGE 1 )
+  set( HAVE_GRIDTOOLS_STORAGE 0 )
   set( atlas_HAVE_GRIDTOOLS_STORAGE 0 )
-  set( ATLAS_GRIDTOOLS_STORAGE_BACKEND_CUDA 0 )
   set( ATLAS_GRIDTOOLS_STORAGE_BACKEND_HOST 0 )
-endif()
+  set( ATLAS_GRIDTOOLS_STORAGE_BACKEND_CUDA 0 )
+endif()
+
diff --git a/cmake/project_summary.cmake b/cmake/project_summary.cmake
@@ -30,19 +30,7 @@ if( CGAL_FOUND )
 
 endif()
 
-if( atlas_HAVE_GRIDTOOLS_STORAGE )
-
-    ecbuild_info( "GRIDTOOLS_STORAGE" )
-    if( ATLAS_GRIDTOOLS_STORAGE_BACKEND_HOST )
-        ecbuild_info( "    BACKEND : [HOST]" )
-    endif()
-    if( ATLAS_GRIDTOOLS_STORAGE_BACKEND_CUDA )
-        ecbuild_info( "    BACKEND : [CUDA]" )
-    endif()
-
-endif()
-
-if( CUDA_FOUND )
+if( atlas_HAVE_CUDA )
 
     ecbuild_info( "CUDA (${CUDA_VERSION})" )
     ecbuild_info( "    CUDA_NVCC_COMPILER  : [${CUDA_NVCC_EXECUTABLE}]" )
@@ -59,3 +47,24 @@ if( atlas_HAVE_ACC )
     ecbuild_info( "    ACC_Fortran_FLAGS  : [${ACC_Fortran_FLAGS}]" )
 
 endif()
+
+
+if( atlas_HAVE_GRIDTOOLS_STORAGE )
+
+    if( ATLAS_GRIDTOOLS_STORAGE_BACKEND_HOST )
+        ecbuild_info( "Array storage backend: GridTools [HOST]" )
+    endif()
+    if( ATLAS_GRIDTOOLS_STORAGE_BACKEND_CUDA )
+        ecbuild_info( "Array storage backend: GridTools [CUDA]" )
+    endif()
+
+else()
+
+    if( NOT atlas_HAVE_CUDA )
+        ecbuild_info( "Array storage backend: Native [HOST]" )
+    else()
+        ecbuild_info( "Array storage backend: Native [CUDA]" )
+    endif()
+
+endif()
+
diff --git a/doc/example-grids/classic_gaussian_2.yml b/doc/example-grids/classic_gaussian_2.yml
@@ -10,7 +10,7 @@ projection :
 
 check : 
   size : 1688
-  lonlat(first) : [3,44.8796]
-  lonlat(last)  : [-172.453,-54.9736]
-  uid : 64d609c6ee4b036b209047aef97a10eb
+  lonlat(first) : [3,49.1204]
+  lonlat(last)  : [179.6485,-38.8936]
+  uid : 02ef7ed866af557e04882342a90fddfe
   bounding_box(n,w,s,e) : [90,0,-90,360]
diff --git a/doc/example-grids/custom_structured_5.yml b/doc/example-grids/custom_structured_5.yml
@@ -10,5 +10,5 @@ check :
   size : 144
   lonlat(first) : [3,40]
   lonlat(last)  : [-177,-40]
-  uid : d55211f27c4a8c6ce94ea67f0c706e22
+  uid : 23f0a23085bbea10277b457f482927c0
   bounding_box(n,w,s,e) : [90,0,-90,360]
diff --git a/doc/example-grids/octahedral_gaussian_2.yml b/doc/example-grids/octahedral_gaussian_2.yml
@@ -7,7 +7,7 @@ projection : { type: "rotated_schmidt", stretching_factor : 4.0,  north_pole : [
 
 check : 
   size : 1600
-  lonlat(first) : [3,45.9397]
-  lonlat(last)  : [-165.776,-62.6128]
-  uid : 20308244515b7c78e22709ebaa842246
+  lonlat(first) : [3,48.0603]
+  lonlat(last)  : [177.0166,-30.8]
+  uid : 1297f9ab088b831da3139eb5f44e20a9
   bounding_box(n,w,s,e) : [90,0,-90,360]
diff --git a/doc/example-grids/octahedral_gaussian_4.yml b/doc/example-grids/octahedral_gaussian_4.yml
@@ -6,7 +6,7 @@ projection : { type: "rotated_schmidt", stretching_factor: 4.0,  north_pole: [3.
 
 check : 
   size : 1600
-  lonlat(first) : [3,45.9397]
-  lonlat(last)  : [-165.776,-62.6128]
-  uid : 20308244515b7c78e22709ebaa842246
+  lonlat(first) : [3,48.0603]
+  lonlat(last)  : [177.0166,-30.8]
+  uid : 1297f9ab088b831da3139eb5f44e20a9
   bounding_box(n,w,s,e) : [90,0,-90,360]
diff --git a/doc/example-grids/regional_rotated_mercator_1.yml b/doc/example-grids/regional_rotated_mercator_1.yml
@@ -14,5 +14,5 @@ check :
   size : 2000
   lonlat(first) : [-10.319,40.2109]
   lonlat(last)  : [24.4206,57.2263]
-  uid : 9d4b8c38db08c6f3fe3221c8770d8d57
+  uid : 88d856331d46d30703b38e3ed2e8b2de
   bounding_box(n,w,s,e) : [58.734,-16.4206,40.2109,24.4206]
diff --git a/doc/example-grids/regular_gaussian_2.yml b/doc/example-grids/regular_gaussian_2.yml
@@ -10,7 +10,7 @@ projection :
 
 check : 
   size : 128
-  lonlat(first) : [3,38.8589]
-  lonlat(last)  : [-135.011,-72.4668]
-  uid : d179fd0b56811242a1a0a8e83dade6a1
+  lonlat(first) : [3,55.1411]
+  lonlat(last)  : [170.8438,-16.8513]
+  uid : 2efc83bfae617ec2fe1a7cebe523cf41
   bounding_box(n,w,s,e) : [90,0,-90,360]
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -78,6 +78,18 @@ else()
   set( atlas_HAVE_INIT_SNAN 0 )
 endif()
 
+if( atlas_HAVE_CUDA )
+  set( atlas_HAVE_CUDA 1 )
+else()
+  set( atlas_HAVE_CUDA 0 )
+endif()
+
+if( atlas_HAVE_ACC )
+  set( atlas_HAVE_ACC 1 )
+else()
+  set( atlas_HAVE_ACC 0 )
+endif()
+
 if( atlas_HAVE_GRIDTOOLS_STORAGE )
   set( atlas_HAVE_GRIDTOOLS_STORAGE 1 )
 else()
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,3 +10,5 @@ build/* @@
     install/*
     env.sh
     *.DS_Store
+    .vscode