mixed precision sat_vapor_pressure (#1095)

NOAA-GFDL · Mar 29, 2023 · 7b3906c · 7b3906c
1 parent cdabf07
commit 7b3906c
Show file tree

Hide file tree

Showing 16 changed files with 4,004 additions and 5,911 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -297,6 +297,7 @@ foreach(kind ${kinds})
                                                  fms2_io/include
                                                  string_utils/include
                                                  mpp/include
+                                                 sat_vapor_pres/include
                                                  horiz_interp/include
                                                  diag_manager/include
                                                  constants4
@@ -337,6 +338,7 @@ foreach(kind ${kinds})
     $<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>

diff --git a/configure.ac b/configure.ac
@@ -479,6 +479,7 @@ AC_CONFIG_FILES([
   test_fms/coupler/Makefile
   test_fms/parser/Makefile
   test_fms/string_utils/Makefile
+  test_fms/sat_vapor_pres/Makefile
   FMS.pc
   ])
 

diff --git a/libFMS.F90 b/libFMS.F90
@@ -381,7 +381,7 @@ module fms
                                 lookup_es2, lookup_des2, lookup_es2_des2, &
                                 lookup_es3, lookup_des3, lookup_es3_des3, &
                                 lookup_es_des, compute_qs, compute_mrs, &
-                                escomp, descomp
+                                escomp, descomp, check_1d, check_2d, temp_check, show_all_bad
   !> string_utils
   use fms_string_utils_mod, only: string, fms_array_to_pointer, fms_pointer_to_array, fms_sort_this, &
                                   fms_find_my_string, fms_find_unique, fms_c2f_string, fms_cstring2cpointer, &

diff --git a/sat_vapor_pres/Makefile.am b/sat_vapor_pres/Makefile.am
@@ -23,24 +23,38 @@
 # Ed Hartnett 2/28/19
 
 # Include .h and .mod files.
-AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/sat_vapor_pres/include
 AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)
 
 # Build these uninstalled convenience library.
 noinst_LTLIBRARIES = libsat_vapor_pres.la
 
 # Each convenience library depends on its source.
 libsat_vapor_pres_la_SOURCES = \
-  sat_vapor_pres.F90 \
-  sat_vapor_pres_k.F90
+	sat_vapor_pres.F90 \
+	include/sat_vapor_pres_r4.fh \
+	include/sat_vapor_pres_r8.fh \
+	include/sat_vapor_pres.inc \
+	sat_vapor_pres_k.F90 \
+	include/sat_vapor_pres_k_r4.fh \
+	include/sat_vapor_pres_k_r8.fh \
+	include/sat_vapor_pres_k.inc
 
 # Some mods are dependant on other mods in this dir.
-sat_vapor_pres_mod.$(FC_MODEXT): sat_vapor_pres_k_mod.$(FC_MODEXT)
+sat_vapor_pres_mod.$(FC_MODEXT): \
+	sat_vapor_pres_k_mod.$(FC_MODEXT) \
+	include/sat_vapor_pres_r4.fh \
+	include/sat_vapor_pres_r8.fh \
+	include/sat_vapor_pres.inc
+sat_vapor_pres_k_mod.$(FC_MODEXT): \
+	include/sat_vapor_pres_k_r4.fh \
+	include/sat_vapor_pres_k_r8.fh \
+	include/sat_vapor_pres_k.inc
 
 # Mod files are built and then installed as headers.
 MODFILES = \
-  sat_vapor_pres_k_mod.$(FC_MODEXT) \
-  sat_vapor_pres_mod.$(FC_MODEXT)
+	sat_vapor_pres_k_mod.$(FC_MODEXT) \
+	sat_vapor_pres_mod.$(FC_MODEXT)
 BUILT_SOURCES = $(MODFILES)
 nodist_include_HEADERS = $(MODFILES)