From 2c6fa1bf07fccd0df2235bc69e9e02b1755ff65e Mon Sep 17 00:00:00 2001 From: Alex Richert Date: Thu, 18 Jul 2024 10:35:08 -0700 Subject: [PATCH] deprecate ipxetas (#245) * deprecate ipxetas * Spack.yml: use grib-util@1.4.0 * debug Spack.yml * debug MacOS.yml * debug grib-util failure in Spack CI --- .github/workflows/Spack.yml | 2 +- src/CMakeLists.txt | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Spack.yml b/.github/workflows/Spack.yml index d9c2ceae..69e6ceeb 100644 --- a/.github/workflows/Spack.yml +++ b/.github/workflows/Spack.yml @@ -33,7 +33,7 @@ jobs: uses: NOAA-EMC/ci-test-spack-package@develop with: package-name: ip - package-variants: ${{ matrix.variants }} ${{ matrix.variants == '+openmp +shared +pic precision=d' && 'grib-util@develop +tests ^g2c@develop +utils +build_v2_api' || '' }} + package-variants: ${{ matrix.variants }} ${{ matrix.variants == '+openmp +shared +pic precision=d' && 'grib-util@develop +tests ^g2c@develop +utils +build_v2_api ^g2@3.5:' || '' }} custom-recipe: spack/package.py spack-compiler: gcc spack-externals: gmake cmake openblas diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1a97fa6c..ce3f73df 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -4,7 +4,7 @@ # These are the source code filees. set(fortran_src gdswzd_c.F90 gdswzd_mod.F90 ipolates.F90 ipolatev.F90 -ipxetas.F90 ipxwafs.F90 ipxwafs2.F90 ipxwafs3.F90 movect.F90 +ipxwafs.F90 ipxwafs2.F90 ipxwafs3.F90 movect.F90 bilinear_interp_mod.F90 bicubic_interp_mod.F90 neighbor_interp_mod.F90 budget_interp_mod.F90 spectral_interp_mod.F90 neighbor_budget_interp_mod.F90 ip_mod.F90 ip_grid_descriptor_mod.F90 ip_grid_mod.F90 @@ -16,6 +16,10 @@ ip_constants_mod.F90 ip_grids_mod.F90 ip_grid_factory_mod.F90 ip_interpolators_mod.F90 earth_radius_mod.F90 polfix_mod.F90 sp_mod.F) +if(BUILD_DEPRECATED) + set(fortran_src ${fortran_src} ipxetas.F90) +endif() + # Set compiler flags. if(CMAKE_BUILD_TYPE MATCHES "Debug") # Bounds checking is turned on for all files for the "Debug" build in the