[master-acc] New driver: ecrad_ifs_field_api

.github/workflows/build-hpc.yml

@@ -7,7 +7,7 @@ on:
   push:
     branches:
     - master-acc
-    - feature/master-acc-build-hpc
+    - feature/master-acc*
     tags-ignore:
     - '**'
 

.github/workflows/build.yml

@@ -31,24 +31,24 @@ jobs:
       matrix:
         build_type: [Release,Bit,Debug]
         name:
-          - linux gnu-12
-          - linux nvhpc-24.3
+          - linux gnu-13
+          - linux nvhpc-25.9
           - linux intel-classic
           - linux intel-llvm
 
         include:
 
-          - name: linux gnu-12
-            os: ubuntu-22.04
-            compiler: gnu-12
-            compiler_cc: gcc-12
-            compiler_cxx: g++-12
-            compiler_fc: gfortran-12
+          - name: linux gnu-13
+            os: ubuntu-24.04
+            compiler: gnu-13
+            compiler_cc: gcc-13
+            compiler_cxx: g++-13
+            compiler_fc: gfortran-13
             caching: true
 
-          - name: linux nvhpc-24.3
-            os: ubuntu-22.04
-            compiler: nvhpc-24.3
+          - name: linux nvhpc-25.9
+            os: ubuntu-24.04
+            compiler: nvhpc
             compiler_cc: nvc
             compiler_cxx: nvc++
             compiler_fc: nvfortran
@@ -122,7 +122,7 @@ jobs:
       if: contains( matrix.compiler, 'nvhpc' )
       shell: bash -eux {0}
       run: |
-        ${ECRAD_TOOLS}/install-nvhpc.sh --prefix /opt/nvhpc --version 24.3
+        ${ECRAD_TOOLS}/install-nvhpc.sh --prefix /opt/nvhpc --version 25.9
         source /opt/nvhpc/env.sh
         echo "${NVHPC_DIR}/compilers/bin" >> $GITHUB_PATH
         echo "NVHPC_ROOT=${NVHPC_DIR}" >> $GITHUB_ENV
@@ -180,14 +180,41 @@ jobs:
         dependencies: |
           ecmwf/ecbuild
           ecmwf-ifs/fiat
+          ecmwf-ifs/field_api@refs/heads/main
         dependency_branch: develop
         dependency_cmake_options: |
           ecmwf-ifs/fiat: "-G Ninja -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DENABLE_TESTS=OFF"
+          ecmwf-ifs/field_api: "-G Ninja -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DENABLE_TESTS=OFF"
         cmake_options:    "-G Ninja -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} ${{ matrix.cmake_options }} -DENABLE_SINGLE_PRECISION=ON -DENABLE_BITIDENTITY_TESTING=ON -DENABLE_ACC=OFF"
         ctest_options: "--output-on-failure ${{ matrix.ctest_options }}"
 
-#    - name: Codecov Upload
-#      if: steps.build-test.outputs.coverage_file
-#      uses: codecov/codecov-action@v2
-#      with:
-#        files: ${{ steps.build-test.outputs.coverage_file }}
+  make:
+    name: Makefile build
+
+    strategy:
+      fail-fast: false    # false: try to complete all jobs
+
+      matrix:
+        name:
+          - linux gnu
+
+        include:
+
+          - name: linux gnu
+            os: ubuntu-24.04
+            profile: gfortran
+
+    runs-on: ${{ matrix.os }}
+    steps:
+    - name: Checkout Repository
+      uses: actions/checkout@v4
+
+    - name: Install dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install libnetcdff-dev nco
+
+    - name: Build & Test
+      run: |
+        make PROFILE=${{ matrix.profile }} -j
+        make test PROFILE=${{ matrix.profile }}

.gitignore

@@ -7,7 +7,7 @@ config_*.nam
 /mod
 /practical/data
 /practical/ecrad
-/build
+/build*
 *.mod
 /bin/ecrad
 /bin/ecrad_ifs

CMakeLists.txt

@@ -58,6 +58,21 @@ if( HAVE_FIAT AND fiat_HAVE_MPI )
     list( APPEND ECRAD_COMPILE_DEFINITIONS EASY_NETCDF_READ_MPI )
 endif()
 
+ecbuild_add_option(
+    FEATURE FIELD_API
+    DEFAULT ON
+    DESCRIPTION "Enable FIELD_API-based driver variant"
+    REQUIRED_PACKAGES "field_api"
+)
+
+find_program(FYPP fypp)
+ecbuild_add_option(
+    FEATURE FYPP
+    DEFAULT OFF
+    DESCRIPTION "Use FYPP to re-generate Fortran code for FIELD_API-based driver variant"
+    CONDITION NOT FYPP-NOTFOUND
+)
+
 ecbuild_add_option(
     FEATURE OMP
     DEFAULT ON

driver/CMakeLists.txt

@@ -17,11 +17,17 @@ ecbuild_add_library(
     PUBLIC_DEFINITIONS
         $<$<NOT:${HAVE_OMP}>:NO_OPENMP>
         ${GPU_OFFLOAD}GPU
+    PUBLIC_INCLUDES
+        "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/module_driver_lib>"
     PUBLIC_LIBS
         ecrad.${PREC}
         ecrad_base.${PREC}
         $<${HAVE_OMP}:OpenMP::OpenMP_Fortran>
 )
+set_target_properties( driver_lib.${PREC}
+    PROPERTIES
+        Fortran_MODULE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/module_driver_lib"
+)
 
 ecbuild_add_executable(
     TARGET ecrad_${PREC}
@@ -48,7 +54,6 @@ ecbuild_add_executable(
     TARGET ecrad_ifs_blocked_${PREC}
     SOURCES
         ecrad_ifs_driver_blocked.F90
-        ifs_blocking.F90
     LIBS
         ifs.${PREC}
         driver_lib.${PREC}
@@ -81,24 +86,38 @@ if( CMAKE_BUILD_TYPE MATCHES "Debug" )
     endif()
 endif()
 
+if( HAVE_FIELD_API )
+    ecbuild_add_executable(
+        TARGET ecrad_ifs_field_api_${PREC}
+        SOURCES
+            ecrad_ifs_driver_field_api.F90
+        LIBS
+            ifs_field_api.${PREC}
+            driver_lib.${PREC}
+        LINKER_LANGUAGE Fortran
+    )
+endif()
+
 # Create a symlink for each driver without the precision suffix.
 # The default is to link to the double precision version if it is built,
 # and single precision otherwise.
 if ( "${PREC}" STREQUAL "dp" OR NOT HAVE_DOUBLE_PRECISION )
-    foreach( tgt ecrad ecrad_ifs ecrad_ifs_blocked )
-        add_custom_command(
-            TARGET ${tgt}_${PREC}
-            POST_BUILD
-            COMMAND
-                "${CMAKE_COMMAND}" -E create_symlink ${tgt}_${PREC} ${tgt}
-            BYPRODUCTS ${tgt}
-            WORKING_DIRECTORY
-                "${CMAKE_BINARY_DIR}/bin"
-            COMMENT "Creating symbolic link from ${tgt} to ${tgt}_${PREC}"
-        )
-        install(
-            FILES ${CMAKE_BINARY_DIR}/bin/${tgt}
-            DESTINATION bin
-        )
+    foreach( tgt ecrad ecrad_ifs ecrad_ifs_blocked ecrad_ifs_field_api )
+        if( TARGET ${tgt}_${PREC} )
+            add_custom_command(
+                TARGET ${tgt}_${PREC}
+                POST_BUILD
+                COMMAND
+                    "${CMAKE_COMMAND}" -E create_symlink ${tgt}_${PREC} ${tgt}
+                BYPRODUCTS ${tgt}
+                WORKING_DIRECTORY
+                    "${CMAKE_BINARY_DIR}/bin"
+                COMMENT "Creating symbolic link from ${tgt} to ${tgt}_${PREC}"
+            )
+            install(
+                FILES ${CMAKE_BINARY_DIR}/bin/${tgt}
+                DESTINATION bin
+            )
+        endif()
     endforeach()
 endif()

driver/Makefile

@@ -28,7 +28,7 @@ $(IFS_EXECUTABLE): $(OBJECTS) ../lib/*.a ecrad_ifs_driver.o
 	$(FC) $(FCFLAGS) ecrad_ifs_driver.o $(OBJECTS) -lifs $(LIBS) -o $(IFS_EXECUTABLE)
 
 $(IFS_BLOCKED_EXECUTABLE): $(OBJECTS) ../lib/*.a ecrad_ifs_driver_blocked.o
-	$(FC) $(FCFLAGS) ifs_blocking.o ecrad_ifs_driver_blocked.o $(OBJECTS) -lifs $(LIBS) -o $(IFS_BLOCKED_EXECUTABLE)
+	$(FC) $(FCFLAGS) ecrad_ifs_driver_blocked.o $(OBJECTS) -lifs $(LIBS) -o $(IFS_BLOCKED_EXECUTABLE)
 
 test_%: test_%.F90 ../lib/*.a
 	$(FC) $(FCFLAGS) $< $(LIBS) -o $@

driver/Makefile_deps

@@ -1,5 +1,4 @@
 ecrad_driver.o: ecrad_driver_config.o ecrad_driver_read_input.o
 ecrad_driver_read_input.o: ecrad_driver_config.o
-ecrad_ifs_driver_blocked.o: ecrad_driver_config.o ecrad_driver_read_input.o ifs_blocking.o
+ecrad_ifs_driver_blocked.o: ecrad_driver_config.o ecrad_driver_read_input.o
 ecrad_ifs_driver.o: ecrad_driver_config.o ecrad_driver_read_input.o
-ifs_blocking.o: ecrad_driver_config.o

driver/ecrad_driver.F90

@@ -54,7 +54,7 @@ program ecrad_driver
   use ecrad_driver_config,      only : driver_config_type
   use ecrad_driver_read_input,  only : read_input
   use easy_netcdf
-  use print_matrix_mod,         only : print_matrix
+  ! use print_matrix_mod,         only : print_matrix
 
   implicit none
 
@@ -96,7 +96,7 @@ program ecrad_driver
   integer, external :: omp_get_thread_num
   real(kind=jprd), external :: omp_get_wtime
   ! Start/stop time in seconds
-  real(kind=jprd) :: tstart, tstop, t0
+  real(kind=jprd) :: tstart=0.0, tstop, t0
 #endif
 
   ! For demonstration of get_sw_weights later on

driver/ecrad_ifs_driver.F90

@@ -197,6 +197,10 @@ program ecrad_ifs_driver
 
   call yradiation%rad_config%read(file_name=file_name)
 
+#ifdef _OPENACC
+  yradiation%yrerad%lecrad_on_gpu = .true.
+#endif
+
   ! Setup aerosols
   if (yradiation%rad_config%use_aerosols) then
     yradiation%yrerad%naermacc = 1 ! MACC-derived aerosol climatology on a NMCLAT x NMCLON grid
@@ -482,7 +486,7 @@ program ecrad_ifs_driver
              &  pcloud_overlap=cloud%overlap_param, &
              &  iseed=single_level%iseed &
 #endif
-             & )
+             &  ,lacc=yradiation%yrerad%lecrad_on_gpu)
       end do
 #ifndef _OPENACC
       !$OMP END PARALLEL DO