Correct spacing, bump ecbuild to match cmake 4.1 requirements, remove extra lines that belong to develop-ecmwf testing

Author: Zbigniew Piotrowski

CMakeLists.txt

@@ -45,8 +45,8 @@ ecbuild_add_option( FEATURE SINGLE_PRECISION
 ecbuild_add_option( FEATURE DOUBLE_PRECISION
 	DESCRIPTION "Compile field_api in double precision" DEFAULT ON)
 
+set(DEFAULT_PRECISION sp)
 if(HAVE_SINGLE_PRECISION)
-    set(DEFAULT_PRECISION sp)
     list(APPEND fiat_components single)
     list(APPEND precisions sp)
 endif()
@@ -75,7 +75,7 @@ ecbuild_add_option( FEATURE IO_PARALLEL
     DEFAULT OFF
 )
 
-if(HAVE_IO_SERIAL OR HAVE_IO_PARALLEL)
+if( HAVE_IO_SERIAL OR HAVE_IO_PARALLEL )
     option( HAVE_IO "HAVE_IO" TRUE)
 else()
     option( HAVE_IO "HAVE_IO" FALSE)
@@ -140,8 +140,8 @@ list(APPEND prec_srcs
     ${CMAKE_CURRENT_BINARY_DIR}/src/util/field_util_module.F90)
 
 if( HAVE_IO )
-list(APPEND prec_srcs
-    ${CMAKE_CURRENT_BINARY_DIR}/src/io/field_hdf5_module.F90)
+  list(APPEND prec_srcs
+      ${CMAKE_CURRENT_BINARY_DIR}/src/io/field_hdf5_module.F90)
 endif()
 
 list(APPEND obj_libs
@@ -172,7 +172,7 @@ foreach(prec ${precisions})
          $<${fiat_FOUND}:parkind_${prec}>
          OpenMP::OpenMP_Fortran
          $<$<BOOL:${HAVE_IO}>:HDF5::HDF5>
-	 $<${HAVE_IO_PARALLEL}:MPI::MPI_Fortran>
+         $<${HAVE_IO_PARALLEL}:MPI::MPI_Fortran>
       )
 
   set_property(TARGET ${LIBNAME}_${prec} PROPERTY C_STANDARD 99)

cmake/field_api_fetchcontent_ecbuild.cmake

@@ -12,9 +12,9 @@
 include(FetchContent)
 FetchContent_Populate(
     ecbuild
-    URL            https://github.com/ecmwf/ecbuild/archive/refs/tags/3.7.0.tar.gz
+    URL            https://github.com/ecmwf/ecbuild/archive/refs/tags/3.11.0.tar.gz
     SOURCE_DIR     ${CMAKE_BINARY_DIR}/ecbuild
     BINARY_DIR     ${CMAKE_BINARY_DIR}/_deps/ecbuild-build
     SUBBUILD_DIR   ${CMAKE_BINARY_DIR}/_deps/ecbuild-subbuild
   )
-find_package( ecbuild 3.7 REQUIRED HINTS ${CMAKE_BINARY_DIR} )
+find_package( ecbuild 3.11 REQUIRED HINTS ${CMAKE_BINARY_DIR} )

src/CMakeLists.txt

@@ -15,6 +15,6 @@ if( HAVE_FIELD_GANG )
 endif()
 add_subdirectory( util )
 add_subdirectory( shuffle )
-if ( HAVE_IO_SERIAL OR HAVE_IO_PARALLEL )
+if( HAVE_IO )
   add_subdirectory( io )
 endif()

src/io/CMakeLists.txt

@@ -35,9 +35,9 @@ field_api_add_object_library(
 )
 
 if(HAVE_IO_SERIAL)
-target_compile_definitions( field_api_io PRIVATE HAVE_IO_SERIAL )
+  target_compile_definitions( field_api_io PRIVATE HAVE_IO_SERIAL )
 elseif(HAVE_IO_PARALLEL)
-target_compile_definitions( field_api_io PRIVATE HAVE_IO_PARALLEL )
+  target_compile_definitions( field_api_io PRIVATE HAVE_IO_PARALLEL )
 endif()
 
 ## don't build precision dependent sourcefile

tests/CMakeLists.txt

@@ -132,13 +132,6 @@ set(ABOR1_TEST_FILES
 	resize_wrapper.F90
 	)
 
-if(HAVE_ACC)
-  list(APPEND TEST_FILES
-       get_device_data_multi_blk_async.F90
-       test_force_async_acc.F90
-      )
-endif()
-
 if(HAVE_IO)
   list(APPEND HDF5_TEST_FILES
        test_hdf5_wr_parallel_field2d.F90
@@ -205,13 +198,13 @@ foreach(TEST_FILE ${HDF5_TEST_FILES})
            $<${fiat_FOUND}:parkind_${DEFAULT_PRECISION}>
            $<${fiat_FOUND}:fiat>
            OpenMP::OpenMP_Fortran
-	   $<${HAVE_MPI}:MPI::MPI_Fortran>
+           $<${HAVE_MPI}:MPI::MPI_Fortran>
            $<${HAVE_ACC}:OpenACC::OpenACC_Fortran>
            $<$<BOOL:${HAVE_IO}>:HDF5::HDF5>
         DEFINITIONS
            $<${HAVE_FIELD_GANG}:HAVE_FIELD_GANG>
         LINKER_LANGUAGE Fortran
-	MPI ${H5MPI_PROCS} 
+        MPI ${H5MPI_PROCS} 
         OMP ${omp_num_threads}
         ENVIRONMENT "DEV_ALLOC_SIZE=${dev_alloc_size}"
     )
@@ -254,7 +247,7 @@ foreach(TEST_FILE ${TEST_FILES})
            $<${HAVE_FIELD_GANG}:HAVE_FIELD_GANG>
         LINKER_LANGUAGE Fortran
         OMP ${omp_num_threads}
-		ENVIRONMENT "DEV_ALLOC_SIZE=${dev_alloc_size}"
+        ENVIRONMENT "DEV_ALLOC_SIZE=${dev_alloc_size}"
     )
 
     set_target_properties(${TEST_NAME}.x