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

Updates to use FMS in Baselibs #69

Merged
merged 2 commits into from
May 29, 2024
Merged

Updates to use FMS in Baselibs #69

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2311f9e
Updates to use FMS in Baselibs
mathomp4 May 10, 2024
0489a0b
Merge branch 'develop' into feature/mathomp4/fms-baselibs
mathomp4 May 29, 2024
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
8 changes: 4 additions & 4 deletions MOM6_GEOSPlug/mom6_cmake/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
esma_set_this (OVERRIDE mom6)

# This is for selecting the MOM6 infrastructure interface
## We default to FMS1 and look if something is passed in...
set (DEFAULT_MOM6_INFRA "FMS1")
## We default to FMS2 and look if something is passed in...
set (DEFAULT_MOM6_INFRA "FMS2")
if (NOT MOM6_INFRA)
set (MOM6_INFRA ${DEFAULT_MOM6_INFRA})
endif ()
Expand Down Expand Up @@ -201,7 +201,7 @@ list( APPEND MOM6_SRCS
src/parameterizations/vertical/MOM_sponge.F90
src/parameterizations/vertical/MOM_tidal_mixing.F90
src/parameterizations/vertical/MOM_vert_friction.F90
src/parameterizations/stochastic/MOM_stochastics.F90
src/parameterizations/stochastic/MOM_stochastics.F90
src/tracer/advection_test_tracer.F90
src/tracer/boundary_impulse_tracer.F90
src/tracer/DOME_tracer.F90
Expand Down Expand Up @@ -524,7 +524,7 @@ esma_add_library (${this}
SRCS ${SRCS}
DEPENDENCIES fms_r8
INCLUDES
$<BUILD_INTERFACE:${MOM6_path}/config_src/memory/dynamic_nonsymmetric>
$<BUILD_INTERFACE:${MOM6_path}/config_src/memory/dynamic_nonsymmetric>
# choose above set MOM6_infra interface
$<BUILD_INTERFACE:${MOM6_path}/config_src/infra/${MOM6_INFRA}>
$<BUILD_INTERFACE:${MOM6_path}/src/framework>
Expand Down
Loading