Merge branch 'ecmwf:develop' into feature/spherical-mean-value-polygon

Author: lewisn-met

.github/workflows/build.yml

@@ -238,7 +238,8 @@ jobs:
     - name: Install Eigen
       if: "!contains( matrix.compiler, 'nvhpc' )"
       run: |
-        brew install eigen
+        brew install eigen@3
+        echo "Eigen3_ROOT=$(brew --prefix eigen@3)" >> $GITHUB_ENV
 
     - name: Save cached dependencies
       # There seems to be a problem with cached NVHPC dependencies, leading to SIGILL perhaps due to slightly different architectures

CHANGELOG.md

@@ -7,6 +7,13 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 
 ## [Unreleased]
 
+## [0.44.1] - 2025-11-07
+
+### Fixed
+- Fix loop bounds for gcc+OpenMP compiler by @fmahebert in https://github.com/ecmwf/atlas/pull/324
+- Fix compilation of atlas_fctest_fvm_nabla with NAG compiler (#326) by @wdeconinck in https://github.com/ecmwf/atlas/pull/330
+- Set Eigen version to eigen@3 in CI to prevent 5.0.0 update
+
 ## [0.44.0] - 2025-10-06
 
 ### Added
@@ -688,6 +695,7 @@ Fix StructuredInterpolation2D with retry for failed stencils
 ## 0.13.0 - 2018-02-16
 
 [Unreleased]: https://github.com/ecmwf/atlas/compare/master...develop
+[0.44.1]: https://github.com/ecmwf/atlas/compare/0.44.0...0.44.1
 [0.44.0]: https://github.com/ecmwf/atlas/compare/0.43.1...0.44.0
 [0.43.1]: https://github.com/ecmwf/atlas/compare/0.43.0...0.43.1
 [0.43.0]: https://github.com/ecmwf/atlas/compare/0.42.0...0.43.0

VERSION

@@ -1 +1 @@
-0.44.0
+0.44.1

src/tests/numerics/fctest_fvm_nabla.F90

@@ -14,7 +14,7 @@
 
 ! -----------------------------------------------------------------------------
 
-module fctest_atlas_nabla_EdgeBasedFiniteVolume_Fixture
+module fctest_atlas_fvm_nabla_Fxt
 use atlas_module
 use, intrinsic :: iso_c_binding
 implicit none
@@ -45,8 +45,8 @@ module fctest_atlas_nabla_EdgeBasedFiniteVolume_Fixture
 
   type :: timer_type
   private
-    integer*8 :: clck_counts_start, clck_counts_stop, clck_rate
-    integer*8 :: counted = 0
+    integer(8) :: clck_counts_start, clck_counts_stop, clck_rate
+    integer(8) :: counted = 0
     logical :: paused = .True.
   contains
     procedure, public :: start   => timer_start
@@ -67,7 +67,8 @@ function timer_elapsed(self) result(time)
         real(c_double) :: time
         if (.not. self%paused) then
             call system_clock ( self%clck_counts_stop, self%clck_rate )
-            time = real(self%counted + self%clck_counts_stop - self%clck_counts_start,c_double)/real(self%clck_rate,c_double)
+            time = real(self%counted + self%clck_counts_stop - self%clck_counts_start,c_double) &
+                & /real(self%clck_rate,c_double)
         else if (self%counted .ge. 0) then
             time = real(self%counted,c_double)/real(self%clck_rate,c_double)
         else
@@ -210,7 +211,7 @@ SUBROUTINE FV_GRADIENT(PVAR,PGRAD)
 INTEGER(KIND=JPIM) :: JNODE,JEDGE,JLEV,INEDGES,IP1,IP2,IEDGE,INODES
 REAL(KIND=JPRB) :: ZAVG,ZSIGN,ZMETRIC_X,ZMETRIC_Y
 REAL(KIND=JPRB), ALLOCATABLE :: ZAVG_S(:,:,:)
-
+INTEGER(KIND=JPIM) :: NFLEVG
 REAL(KIND=JPRB) :: SCALE, DEG2RAD
 DEG2RAD = RPI/180.
 SCALE = DEG2RAD*DEG2RAD*RA
@@ -219,7 +220,7 @@ SUBROUTINE FV_GRADIENT(PVAR,PGRAD)
 
 !IF (LHOOK) CALL DR_HOOK('FV_GRADIENT',0,ZHOOK_HANDLE)
 
-ASSOCIATE(NFLEVG=>nlev)
+NFLEVG=nlev
 
 !write(0,*) 'enter fv_gradient'
 !write(0,*) 'shape pvar ',shape(pvar)
@@ -253,7 +254,8 @@ SUBROUTINE FV_GRADIENT(PVAR,PGRAD)
 !$OMP END PARALLEL DO
 
 INODES = SIZE(ZLONLAT)/2
-!$OMP PARALLEL DO SCHEDULE(STATIC) PRIVATE(JNODE,JLEV,JEDGE,IEDGE,ZSIGN,ZMETRIC_X,ZMETRIC_Y,INODE2EDGE,INODE2EDGE_SIZE)
+!$OMP PARALLEL DO SCHEDULE(STATIC) &
+!$OMP& PRIVATE(JNODE,JLEV,JEDGE,IEDGE,ZSIGN,ZMETRIC_X,ZMETRIC_Y,INODE2EDGE,INODE2EDGE_SIZE)
 DO JNODE=1,INODES
 
   DO JLEV=1,NFLEVG
@@ -278,19 +280,17 @@ SUBROUTINE FV_GRADIENT(PVAR,PGRAD)
 ENDDO
 !$OMP END PARALLEL DO
 
-END ASSOCIATE
-
 !IF (LHOOK) CALL DR_HOOK('FV_GRADIENT',1,ZHOOK_HANDLE)
 END SUBROUTINE FV_GRADIENT
 
 
 
 
-end module fctest_atlas_nabla_EdgeBasedFiniteVolume_Fixture
+end module fctest_atlas_fvm_nabla_Fxt
 
 ! -----------------------------------------------------------------------------
 
-TESTSUITE_WITH_FIXTURE(fctest_atlas_nabla_EdgeBasedFiniteVolume,fctest_atlas_nabla_EdgeBasedFiniteVolume_Fixture)
+TESTSUITE_WITH_FIXTURE(fctest_atlas_fvm_nabla,fctest_atlas_fvm_nabla_Fxt)
 
 ! -----------------------------------------------------------------------------