feat: mixed precision random_numbers_mod (#1191)

NOAA-GFDL · Jun 7, 2023 · 9f3c791 · 9f3c791
1 parent c036f90
commit 9f3c791
Show file tree

Hide file tree

Showing 13 changed files with 488 additions and 471 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -299,7 +299,7 @@ foreach(kind ${kinds})
                                                  mpp/include
                                                  sat_vapor_pres/include
                                                  horiz_interp/include
-                                                 field_manager/include
+                                                 random_numbers/include
                                                  diag_manager/include
                                                  constants4
                                                  constants
@@ -345,6 +345,7 @@ foreach(kind ${kinds})
     $<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}/random_numbers/include>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/diag_manager/include>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/field_manager/include>)
 

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

diff --git a/random_numbers/Makefile.am b/random_numbers/Makefile.am
@@ -23,16 +23,19 @@
 # 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)/random_numbers/include
 AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)
 
 # Build these uninstalled convenience library.
 noinst_LTLIBRARIES = librandom_numbers.la
 
 # Each convenience library depends on its source.
 librandom_numbers_la_SOURCES = \
+  mersennetwister.F90 \
   random_numbers.F90 \
-  mersennetwister.F90
+  include/random_numbers.inc \
+  include/random_numbers_r4.fh \
+  include/random_numbers_r8.fh
 
 # Some mods are dependant on other mods in this dir.
 random_numbers_mod.$(FC_MODEXT): mersennetwister_mod.$(FC_MODEXT)

diff --git a/random_numbers/include/mersennetwister.inc b/random_numbers/include/mersennetwister.inc