Merge branch 'main' into gnu-15-ci

Author: rem1776

.github/workflows/github_autotools_intel_classic.yml

@@ -22,8 +22,6 @@ jobs:
         LDFLAGS: "-L/libs/lib"
         TEST_VERBOSE: 1
         I_MPI_FABRICS: "shm" # needed for mpi in image
-        # intel bug causes some failures with shm option(required in container)
-        SKIP_TESTS: "test_mpp_update_domains.1 test_update_domains_performance.1 test_diag_manager2.23"
     steps:
     - name: Cache dependencies
       id: cache

.github/workflows/github_autotools_intel_oneapi.yml

@@ -20,8 +20,6 @@ jobs:
         LDFLAGS: "-L/libs/lib"
         TEST_VERBOSE: 1
         I_MPI_FABRICS: "shm" # needed for mpi in image
-        # intel bug causes some failures with shm option(required in container)
-        SKIP_TESTS: "test_mpp_update_domains.1 test_update_domains_performance.1 test_diag_manager2.23"
     steps:
     - name: Cache dependencies
       id: cache

.github/workflows/github_cmake_gnu.yml

@@ -27,7 +27,7 @@ jobs:
       run: |
         mkdir build
         cd build
-        cmake -DOVERSUBSCRIBE_FLAG="--map-by :OVERSUBSCRIBE" $CMAKE_FLAGS -DOPENMP=on -DNetCDF_ROOT=/opt/view -DLIBYAML_ROOT=/opt/view ..
+        cmake -DOVERSUBSCRIBE_FLAG="--map-by :OVERSUBSCRIBE" $CMAKE_FLAGS -DOPENMP=on -DNetCDF_ROOT=/opt/view -DLIBYAML_ROOT=/opt/view -DUNIT_TESTS=on ..
     - name: Build the library
       run: make -C build
     - name: Run the unit tests
@@ -52,7 +52,7 @@ jobs:
       run: |
         mkdir build
         cd build
-        cmake $CMAKE_FLAGS -DOPENMP=on -DNetCDF_ROOT=/opt/view -DLIBYAML_ROOT=/opt/view ..
+        cmake $CMAKE_FLAGS -DOPENMP=on -DUNIT_TESTS=on -DNetCDF_ROOT=/opt/view -DLIBYAML_ROOT=/opt/view ..
     - name: Build the library
       run: make -C build
     - name: Run the unit tests

CMAKE_INSTRUCTIONS.md

@@ -82,6 +82,7 @@ The following build options are available:
 -DGFS_PHYS              "Enable compiler definition -DGFS_PHYS"              DEFAULT:OFF
 -DLARGEFILE             "Enable compiler definition -Duse_LARGEFILE"         DEFAULT:OFF
 -DWITH_YAML             "Enable compiler definition -Duse_yaml"              DEFAULT:OFF
+-DUNIT_TESTS            "Toggle on build of unit tests"                      DEFAULT:OFF
 ```
 
 ## 3. Installation structure

CMakeLists.txt

@@ -24,7 +24,7 @@ AC_PREREQ([2.69])
 
 # Initialize with name, version, and support email address.
 AC_INIT([GFDL FMS Library],
-  [2026.01.01],
+  [2026.01.01-dev],
   [gfdl.climate.model.info@noaa.gov],
   [FMS],
   [https://www.github.com/NOAA-GFDL/FMS])

configure.ac

@@ -2018,6 +2018,9 @@ subroutine generate_associated_files_att(this, att, start_time, var_output_name)
   file_name = this%get_field_file_name()
   field_name = this%get_varname(to_write = .true., filename=file_name)
 
+  ! Save the outputname of the area/volume so it can be added correctly to the cell_measures attribute
+  var_output_name = field_name
+
   ! Check if the field is already in the associated files attribute (i.e the area can be associated with multiple
   ! fields in the file, but it only needs to be added once)
   if (index(att, field_name) .ne. 0) return
@@ -2029,9 +2032,6 @@ subroutine generate_associated_files_att(this, att, start_time, var_output_name)
   endif
 
   att = trim(att)//" "//trim(field_name)//": "//trim(file_name)//".nc"
-
-  ! Save the outputname of the area/volume so it can be added correctly to the cell_measures attribute
-  var_output_name = field_name
 end subroutine generate_associated_files_att
 
 !> @brief Determines if the compute domain has been divide further into slices (i.e openmp blocks)

diag_manager/fms_diag_field_object.F90

@@ -325,7 +325,7 @@ end subroutine drifters_comm_set_domain
   subroutine drifters_comm_update(self, drfts, new_positions, &
        & comm, remove, max_add_remove)
 #ifndef _SERIAL
-   use mpi
+   use mpi_f08
 #endif
 
     type(drifters_comm_type)   :: self
@@ -599,7 +599,7 @@ subroutine drifters_comm_gather(self, drfts, dinp, &
        & root, mycomm)
 
 #ifndef _SERIAL
-    use mpi
+    use mpi_f08
 #endif
     use drifters_input_mod, only : drifters_input_type, drifters_input_save