feat: mixed precision for axis_utils2, horiz_interp, sat_vapor_pressu…

…re, and fms_mod (#1239)

* feat: mixed precision axis_utils2 (#1104)

* feat: mixed precision fms_mod (#1147)

* feat: horiz interp mixed precision (#1067)

* mixed precision sat_vapor_pressure  (#1095)

* feat: add mixed precision axis_utils unit tests (#1172)

* fix: move type definitions to before first usage to fix nvhpc bug (#1187)

* fix: change allocatable type for intel errors (#1221)

Co-authored-by: Caitlyn McAllister <65364559+mcallic2@users.noreply.github.com>
Co-authored-by: Jesse Lentz <42011922+J-Lentz@users.noreply.github.com>
Co-authored-by: MiKyung Lee <58964324+mlee03@users.noreply.github.com>

CMakeLists.txt

@@ -295,12 +295,16 @@ foreach(kind ${kinds})
 
   target_include_directories(${libTgt}_f PRIVATE include
                                                  fms
+                                                 fms/include
                                                  fms2_io/include
                                                  string_utils/include
                                                  mpp/include
+                                                 sat_vapor_pres/include
+                                                 horiz_interp/include
                                                  diag_manager/include
                                                  constants4
-                                                 constants)
+                                                 constants
+                                                 axis_utils/include)
   target_compile_definitions(${libTgt}_f PRIVATE "${fms_defs}")
   target_compile_definitions(${libTgt}_f PRIVATE "${${kind}_defs}")
 
@@ -334,7 +338,10 @@ foreach(kind ${kinds})
   target_include_directories(${libTgt} PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/fms>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/fms/include>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/fms2_io/include>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/sat_vapor_pres/include>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/horiz_interp/include>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/string_utils/include>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/mpp/include>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/diag_manager/include>)

axis_utils/Makefile.am

@@ -23,15 +23,23 @@
 # Ed Hartnett 2/22/19
 
 # Include .h and .mod files.
-AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/axis_utils/include
 AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)
 
 # Build this uninstalled convenience library.
 noinst_LTLIBRARIES = libaxis_utils.la
 
 libaxis_utils_la_SOURCES = \
   axis_utils.F90 \
-  axis_utils2.F90
+  axis_utils2.F90 \
+  include/axis_utils2_r4.fh \
+  include/axis_utils2_r8.fh \
+  include/axis_utils2.inc
+
+axis_utils2.$(FC_MODEXT) : \
+include/axis_utils2_r4.fh \
+include/axis_utils2_r8.fh \
+include/axis_utils2.inc
 
 # Mod file depends on its o file, is built and then installed.
 nodist_include_HEADERS = axis_utils_mod.$(FC_MODEXT) axis_utils2_mod.$(FC_MODEXT)