Skip to content
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.

Sign up for GitHub

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

Jump to bottom

WIP: ELMKernels coupling #217

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

WIP: ELMKernels coupling #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
091e979
basic skeleton PK for ELMKernels coupling
jbeisman Oct 3, 2022
1aa8a7c
Merge branch 'master' of github.com:amanzi/ats into jb/ELMKernels
jbeisman Nov 9, 2022
11907e9
started elm kernels interface
jbeisman Nov 10, 2022
a326ed3
hardwired to build with ELMKernels library
jbeisman Dec 15, 2022
0404040
call ELM functionality from ATS
jbeisman Dec 15, 2022
5867133
progress toward ELM interface
jbeisman Jan 5, 2023
fb0f941
Merge branch 'master' of https://github.com/amanzi/ats into jb-ELMKer…
jbeisman Aug 31, 2023
0fa679b
Deleted some unused code
jbeisman Oct 24, 2023
e25ce0f
ELMKernels surface balance PK compiles and links against ELMKernels l…
jbeisman Oct 24, 2023
2d9eb9c
Merge branch 'master' of github.com:amanzi/ats into jb-ELMKernels
jbeisman Oct 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/executables/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,10 @@ set(ats_link_libs
)


set(ELM_LIBRARIES $ENV{ELM_DIR}/install/lib/libelm_kokkos.dylib)
set(ELM_INCLUDES_DIR $ENV{ELM_DIR}/install/include)
include_directories(${ELM_INCLUDES_DIR})

# note, we can be inclusive here, because if they aren't enabled,
# these won't be defined and will result in empty strings.
set(tpl_link_libs
Expand All @@ -135,6 +139,7 @@ set(tpl_link_libs
${HYPRE_LIBRARIES}
${HDF5_LIBRARIES}
${CLM_LIBRARIES}
${ELM_LIBRARIES}
)

add_amanzi_library(ats_executable
Expand Down
28 changes: 28 additions & 0 deletions src/pks/surface_balance/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
# -*- mode: cmake -*-
# ATS Surface balance PKs describe Evaporation, energy fluxes from
# long/showtwave radiation, precip, etc etc etc

# temporary ELMKernels
set(ELM_LIBRARIES $ENV{ELM_DIR}/install/lib/libelm_kokkos.dylib)
set(ELM_INCLUDES_DIR $ENV{ELM_DIR}/install/include)
include_directories(${ELM_INCLUDES_DIR})


include_directories(${ATS_SOURCE_DIR}/src/pks)
include_directories(${ATS_SOURCE_DIR}/src/constitutive_relations/surface_subsurface_fluxes)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/constitutive_relations/land_cover)
Expand Down Expand Up @@ -52,6 +59,13 @@ if (ENABLE_CLM)
)
endif()

set(ENABLE_ELM true)
if (ENABLE_ELM)
list(APPEND ats_surface_balance_src_files
ELMKernels/surface_balance_ELMKernels.cc
)
endif()

set(ats_surface_balance_inc_files
constitutive_relations/land_cover/seb_physics_defs.hh
constitutive_relations/land_cover/seb_physics_funcs.hh
Expand Down Expand Up @@ -97,10 +111,17 @@ if (ENABLE_CLM)
)
endif()

if (ENABLE_ELM)
list(APPEND ats_surface_balance_inc_files
ELMKernels/surface_balance_ELMKernels.hh
)
endif()

set(ats_surface_balance_link_libs
${Teuchos_LIBRARIES}
${Epetra_LIBRARIES}
${CLM_LIBRARIES}
${ELM_LIBRARIES}
error_handling
atk
mesh
Expand Down Expand Up @@ -147,6 +168,13 @@ if (ENABLE_CLM)
)
endif()

if (ENABLE_ELM)
register_evaluator_with_factory(
HEADERFILE ELMKernels/surface_balance_ELMKernels_reg.hh
LISTNAME ATS_SURFACE_BALANCE_REG
)
endif()

register_evaluator_with_factory(
HEADERFILE surface_balance_base_reg.hh
LISTNAME ATS_SURFACE_BALANCE_REG
Expand Down
Loading
Loading