Merge branch 'develop' into arakawa_grib2_fix

NOAA-EMC · Jul 18, 2024 · 426a6c7 · 426a6c7
2 parents 9686f78 + 2c6fa1b
commit 426a6c7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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 ^[email protected]:' || '' }}
         custom-recipe: spack/package.py
         spack-compiler: gcc
         spack-externals: gmake cmake openblas

diff --git 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