Skip to content

Commit

Permalink
merge topography
Browse files Browse the repository at this point in the history
  • Loading branch information
mcallic2 committed Aug 16, 2023
2 parents 1e00d9d + 3637847 commit c997d69
Show file tree
Hide file tree
Showing 26 changed files with 1,713 additions and 4,874 deletions.
4 changes: 3 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -307,13 +307,15 @@ foreach(kind ${kinds})
monin_obukhov/include
sat_vapor_pres/include
horiz_interp/include
diag_integral/include
random_numbers/include
diag_manager/include
constants4
constants
topography/include
axis_utils/include
field_manager/include
time_interp/include
tracer_manager/include)

target_compile_definitions(${libTgt}_f PRIVATE "${fms_defs}")
Expand Down Expand Up @@ -359,8 +361,8 @@ foreach(kind ${kinds})
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/mpp/include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/topography/include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/random_numbers/include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/diag_integral/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>)


Expand Down
2 changes: 2 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -496,8 +496,10 @@ AC_CONFIG_FILES([
test_fms/parser/Makefile
test_fms/string_utils/Makefile
test_fms/sat_vapor_pres/Makefile
test_fms/diag_integral/Makefile
test_fms/tracer_manager/Makefile
test_fms/random_numbers/Makefile
FMS.pc
])

Expand Down
12 changes: 10 additions & 2 deletions diag_integral/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,22 @@
# 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)/diag_integral/include
AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)

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

# The convenience library depends on its source.
libdiag_integral_la_SOURCES = diag_integral.F90
libdiag_integral_la_SOURCES = diag_integral.F90\
include/diag_integral.inc\
include/diag_integral_r4.fh\
include/diag_integral_r8.fh

diag_integral_mod.$(FC_MODEXT): include/diag_integral.inc\
include/diag_integral_r4.fh\
include/diag_integral_r8.fh


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

0 comments on commit c997d69

Please sign in to comment.