Merge branch 'master' into nvhpc

Author: sbryngelson

.github/workflows/test.yml

@@ -298,14 +298,20 @@ jobs:
           sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
           sudo add-apt-repository "deb https://apt.repos.intel.com/oneapi all main"
           sudo apt-get update
-          sudo apt-get install -y intel-oneapi-compiler-fortran intel-oneapi-mpi intel-oneapi-mpi-devel
+          sudo apt-get install -y intel-oneapi-compiler-fortran intel-oneapi-compiler-dpcpp-cpp intel-oneapi-mpi intel-oneapi-mpi-devel
           # Export only new/changed env vars from setvars.sh.
           # `printenv >> $GITHUB_ENV` dumps all vars including shell internals
           # with special characters that corrupt GITHUB_ENV parsing.
           printenv | sort > /tmp/env_before
           source /opt/intel/oneapi/setvars.sh
           printenv | sort > /tmp/env_after
           diff /tmp/env_before /tmp/env_after | grep '^>' | sed 's/^> //' >> $GITHUB_ENV
+          echo "FC=ifx" >> $GITHUB_ENV
+          echo "CC=icx" >> $GITHUB_ENV
+          echo "CXX=icpx" >> $GITHUB_ENV
+          echo "MPIFC=mpiifx" >> $GITHUB_ENV
+          echo "MPICC=mpiicx" >> $GITHUB_ENV
+          echo "MPICXX=mpiicpx" >> $GITHUB_ENV
 
       # --- NVHPC container setup ---
       - name: Setup NVHPC

CMakeLists.txt

@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: MIT
 
+# Intel ifx/icx CI support
 # Developer's note:
 #  CMake has extensive documentation available online. Searching "cmake <variable>"
 #  or "cmake <function_name>" will return a cmake.org page with more information

src/post_process/m_data_output.fpp

@@ -489,8 +489,8 @@ contains
 
             if (p > 0) then
                 err = DBMKOPTLIST(2, optlist)
-                err = DBADDIOPT(optlist, DBOPT_LO_OFFSET, lo_offset)
-                err = DBADDIOPT(optlist, DBOPT_HI_OFFSET, hi_offset)
+                err = DBADDIAOPT(optlist, DBOPT_LO_OFFSET, size(lo_offset), lo_offset)
+                err = DBADDIAOPT(optlist, DBOPT_HI_OFFSET, size(hi_offset), hi_offset)
                 if (grid_geometry == 3) then
                     err = DBPUTQM(dbfile, 'rectilinear_grid', 16, 'x', 1, 'y', 1, 'z', 1, y_cb, z_cb, x_cb, dims, 3, DB_DOUBLE, &
                                   & DB_COLLINEAR, optlist, ierr)
@@ -501,15 +501,15 @@ contains
                 err = DBFREEOPTLIST(optlist)
             else if (n > 0) then
                 err = DBMKOPTLIST(2, optlist)
-                err = DBADDIOPT(optlist, DBOPT_LO_OFFSET, lo_offset)
-                err = DBADDIOPT(optlist, DBOPT_HI_OFFSET, hi_offset)
+                err = DBADDIAOPT(optlist, DBOPT_LO_OFFSET, size(lo_offset), lo_offset)
+                err = DBADDIAOPT(optlist, DBOPT_HI_OFFSET, size(hi_offset), hi_offset)
                 err = DBPUTQM(dbfile, 'rectilinear_grid', 16, 'x', 1, 'y', 1, 'z', 1, x_cb, y_cb, DB_F77NULL, dims, 2, DB_DOUBLE, &
                               & DB_COLLINEAR, optlist, ierr)
                 err = DBFREEOPTLIST(optlist)
             else
                 err = DBMKOPTLIST(2, optlist)
-                err = DBADDIOPT(optlist, DBOPT_LO_OFFSET, lo_offset)
-                err = DBADDIOPT(optlist, DBOPT_HI_OFFSET, hi_offset)
+                err = DBADDIAOPT(optlist, DBOPT_LO_OFFSET, size(lo_offset), lo_offset)
+                err = DBADDIAOPT(optlist, DBOPT_HI_OFFSET, size(hi_offset), hi_offset)
                 err = DBPUTQM(dbfile, 'rectilinear_grid', 16, 'x', 1, 'y', 1, 'z', 1, x_cb, DB_F77NULL, DB_F77NULL, dims, 1, &
                               & DB_DOUBLE, DB_COLLINEAR, optlist, ierr)
                 err = DBFREEOPTLIST(optlist)