-
Notifications
You must be signed in to change notification settings - Fork 135
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Mixed precision: fms_mod #1147
Mixed precision: fms_mod #1147
Changes from 9 commits
f5a7eec
9129377
a703614
fbcb5e1
327d1a5
e9b122d
e436c85
a6de483
20ee3aa
a71c20e
c245ad6
1a1f887
850d957
0b397a6
2f60d9b
2dee075
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -288,9 +288,12 @@ foreach(kind ${kinds}) | |
|
||
target_include_directories(${libTgt}_f PRIVATE include | ||
fms | ||
fms/include | ||
fms2_io/include | ||
string_utils/include | ||
mpp/include | ||
constants) | ||
constants | ||
test_fms/fms/include) | ||
target_compile_definitions(${libTgt}_f PRIVATE "${fms_defs}") | ||
target_compile_definitions(${libTgt}_f PRIVATE "${${kind}_defs}") | ||
|
||
|
@@ -324,8 +327,11 @@ 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}/mpp/include>) | ||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/string_utils/include> | ||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/mpp/include> | ||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/test_fms/fms/include>) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. here too There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Removed in 1a1f887. |
||
|
||
target_include_directories(${libTgt} INTERFACE | ||
$<BUILD_INTERFACE:${moduleDir}> | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -23,7 +23,7 @@ | |
# 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)/fms/include | ||
AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR) | ||
|
||
# Build these uninstalled convenience libraries. | ||
|
@@ -32,6 +32,9 @@ noinst_LTLIBRARIES = libfms.la | |
# Each convenience library depends on its source. | ||
libfms_la_SOURCES = \ | ||
fms.F90 \ | ||
include/fms.inc \ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. are these also needed for fms_mod.$(FC_MODEXT)? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
include/fms_r4.fh \ | ||
include/fms_r8.fh \ | ||
fms_io.F90 \ | ||
fms_io_unstructured_field_exist.inc \ | ||
fms_io_unstructured_get_file_name.inc \ | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
not sure if test_fms is needed for CMake yet. @rem1776, is this correct?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah that's correct we don't have cmake set up to run the tests so we don't need to compile them
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removed from
CMakeLists.txt
in 1a1f887.