Skip to content

Commit

Permalink
Mixed precision amip_interp_mod (#1365)
Browse files Browse the repository at this point in the history
BREAKING CHANGE: Several variables and arrays which were previously public have been made private.
These variables and arrays are not used in ice_amip or ocean_amip.
amip_interp_type(r4_kind) and amip_interp_type(r8_kind) should be used for
r4_kind and r8_kind precision, respectively. amip_interp_type without a kind
parameter defaults to r8_kind.
  • Loading branch information
J-Lentz authored Oct 4, 2023
1 parent ea79688 commit 0f3d5e9
Show file tree
Hide file tree
Showing 6 changed files with 410 additions and 1,920 deletions.
6 changes: 4 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,8 @@ foreach(kind ${kinds})
tridiagonal/include
interpolator/include
coupler/include
data_override/include)
data_override/include
amip_interp/include)

target_compile_definitions(${libTgt}_f PRIVATE "${fms_defs}")
target_compile_definitions(${libTgt}_f PRIVATE "${${kind}_defs}")
Expand Down Expand Up @@ -378,7 +379,8 @@ foreach(kind ${kinds})
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/interpolator/include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/coupler/include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/mosaic2/include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/data_override/include>)
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/data_override/include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/amip_interp/include>)

target_include_directories(${libTgt} INTERFACE
$<BUILD_INTERFACE:${moduleDir}>
Expand Down
8 changes: 6 additions & 2 deletions amip_interp/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,18 @@
# 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)/amip_interp/include
AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)

# Build this uninstalled convenience library.
noinst_LTLIBRARIES = libamip_interp.la

# The convenience library depends on its source.
libamip_interp_la_SOURCES = amip_interp.F90
libamip_interp_la_SOURCES = \
amip_interp.F90 \
include/amip_interp.inc \
include/amip_interp_r4.fh \
include/amip_interp_r8.fh

BUILT_SOURCES = amip_interp_mod.$(FC_MODEXT)
nodist_include_HEADERS = amip_interp_mod.$(FC_MODEXT)
Expand Down
Loading

0 comments on commit 0f3d5e9

Please sign in to comment.