Mixed Precision tracer_manager

CMakeLists.txt

@@ -299,10 +299,13 @@ foreach(kind ${kinds})
                                                  mpp/include
                                                  sat_vapor_pres/include
                                                  horiz_interp/include
+                                                 field_manager/include
                                                  diag_manager/include
                                                  constants4
                                                  constants
-                                                 axis_utils/include)
+                                                 axis_utils/include
+                                                 field_manager/include
+                                                 tracer_manager/include)
   target_compile_definitions(${libTgt}_f PRIVATE "${fms_defs}")
   target_compile_definitions(${libTgt}_f PRIVATE "${${kind}_defs}")
 
@@ -339,10 +342,13 @@ foreach(kind ${kinds})
     $<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}/field_manager/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>)
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/diag_manager/include>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/field_manager/include>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/tracer_manager/include>)
 
   target_include_directories(${libTgt} INTERFACE
     $<BUILD_INTERFACE:${moduleDir}>

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/tracer_manager/Makefile
   FMS.pc
   ])
 

coupler/coupler_types.F90

@@ -38,6 +38,7 @@ module coupler_types_mod
   use data_override_mod, only: data_override
   use mpp_domains_mod,   only: domain2D, mpp_redistribute
   use mpp_mod,           only: mpp_error, FATAL, mpp_chksum
+  use platform_mod,      only: r4_kind, r8_kind
 
   use iso_fortran_env, only : int32, int64  !To get mpp_chksum value
 
@@ -193,16 +194,23 @@ module coupler_types_mod
     type(coupler_1d_values_type), pointer, dimension(:)   :: field => NULL() !< field
     character(len=128)             :: flux_type = ' ' !< flux_type
     character(len=128)             :: implementation = ' ' !< implementation
-    real, pointer, dimension(:)    :: param => NULL() !< param
+    !> precision has been explicitly defined
+    !! to be r8_kind during mixedmode update to field_manager
+    !! this explicit definition can be removed during the coupler update and be made into FMS_CP_KIND_
+    real(r8_kind), pointer, dimension(:) :: param => NULL() !< param
     logical, pointer, dimension(:) :: flag => NULL() !< flag
     integer                        :: atm_tr_index = 0 !< atm_tr_index
     character(len=128)             :: ice_restart_file = ' ' !< ice_restart_file
     character(len=128)             :: ocean_restart_file = ' ' !< ocean_restart_file
     logical                        :: use_atm_pressure !< use_atm_pressure
     logical                        :: use_10m_wind_speed !< use_10m_wind_speed
     logical                        :: pass_through_ice !< pass_through_ice
-    real                           :: mol_wt = 0.0 !< mol_wt
-  end type coupler_1d_field_type
+    !> precision has been explicitly defined
+    !! to be r8_kind during mixedmode update to field_manager
+    !! this explicit definition can be removed during the coupler update and be made into FMS_CP_KIND_
+    real(r8_kind)                  :: mol_wt = 0.0 !< mol_wt
+
+ end type coupler_1d_field_type
 
   !> Coupler data for 1D boundary conditions
   !> @ingroup coupler_types_mod

field_manager/Makefile.am

@@ -23,27 +23,35 @@
 # 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)/field_manager/include
 AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)
 
 # Build these uninstalled convenience libraries.
 noinst_LTLIBRARIES = libfield_manager.la
 
 # Each convenience library depends on its source.
 libfield_manager_la_SOURCES = \
-  field_manager.F90 \
-  fm_yaml.F90 \
-  fm_util.F90 \
-  parse.inc
-
-field_manager_mod.$(FC_MODEXT): parse.inc fm_yaml_mod.$(FC_MODEXT)
-fm_util_mod.$(FC_MODEXT): field_manager_mod.$(FC_MODEXT)
+	field_manager.F90 \
+	fm_yaml.F90 \
+	fm_util.F90 \
+	parse.inc \
+	include/field_manager.inc \
+	include/field_manager_r4.fh \
+	include/field_manager_r8.fh \
+	include/fm_util.inc \
+	include/fm_util_r4.fh \
+	include/fm_util_r8.fh
+
+field_manager_mod.$(FC_MODEXT): parse.inc fm_yaml_mod.$(FC_MODEXT) \
+	include/field_manager.inc include/field_manager_r4.fh include/field_manager_r8.fh
+fm_util_mod.$(FC_MODEXT): field_manager_mod.$(FC_MODEXT) \
+	include/fm_util.inc include/fm_util_r4.fh include/fm_util_r8.fh
 
 # Mod files are built and then installed as headers.
 MODFILES = \
-  field_manager_mod.$(FC_MODEXT) \
-  fm_util_mod.$(FC_MODEXT) \
-  fm_yaml_mod.$(FC_MODEXT)
+	field_manager_mod.$(FC_MODEXT) \
+	fm_util_mod.$(FC_MODEXT) \
+	fm_yaml_mod.$(FC_MODEXT)
 BUILT_SOURCES = $(MODFILES)
 nodist_include_HEADERS = $(MODFILES)