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

Optional addition of ocean_bgc into mom6 libraries #10

Closed
wants to merge 2 commits into from
Closed

Optional addition of ocean_bgc into mom6 libraries #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29e3b0a
modified CMakeLists.txt to enable optional addition of ocean_bgc src …
liuxiao37k Apr 29, 2020
913df68
import ocean_bgc_src_files and build them into mom6 libraries
liuxiao37k Jun 25, 2020
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
27 changes: 12 additions & 15 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,22 +67,14 @@ include_directories( ${NETCDF_INCLUDE_DIRS} )
ecbuild_use_package( PROJECT fms REQUIRED )
include_directories( ${FMS_INCLUDE_DIRS} )

# cvmix
ecbuild_use_package( PROJECT cvmix REQUIRED )
include_directories( ${CVMIX_INCLUDE_DIRS} )

# gsw
ecbuild_use_package( PROJECT gsw REQUIRED )
include_directories( ${GSW_INCLUDE_DIRS} )

# geoKdTree
ecbuild_use_package( PROJECT geokdtree REQUIRED )
include_directories( ${GEOKDTREE_INCLUDE_DIRS} )

# mom6_da_hooks
ecbuild_use_package( PROJECT mom6_da_hooks REQUIRED )
include_directories( ${MOM6_DA_HOOKS_INCLUDE_DIRS} )

# ocean_bgc
if (${ENABLE_OCEAN_BGC})
add_definitions( -D_USE_GENERIC_TRACER )
endif()
################################################################################
# Definitions
################################################################################
Expand Down Expand Up @@ -121,10 +113,15 @@ list( APPEND mom6_src_files
${src_files}
)

if (${ENABLE_OCEAN_BGC})
list( APPEND mom6_src_files ${OCEAN_BGC_SRC_FILES} )
endif()

ecbuild_add_library( TARGET mom6
SOURCES ${mom6_src_files}
LIBS ${LAPACK_LIBRARIES} ${NETCDF_LIBRARIES} ${FMS_LIBRARIES} ${CVMIX_LIBRARIES} ${GEOKDTREE_LIBRARIES} ${MOM6_DA_HOOKS_LIBRARIES} ${GSW_LIBRARIES}
INCLUDES ${FMS_INCLUDES} ${CVMIX_INCLUDES} ${GEOKDTREE_INCLUDES} ${MOM6_DA_HOOKS_INCLUDES} ${GSW_INCLUDES}
SOURCES ${mom6_src_files}
LIBS ${LAPACK_LIBRARIES} ${NETCDF_LIBRARIES}
${FMS_LIBRARIES} ${GSW_LIBRARIES}
INCLUDES ${FMS_INCLUDES} ${GSW_INCLUDES}
INSTALL_HEADERS LISTED
LINKER_LANGUAGE ${MOM6_LINKER_LANGUAGE}
)
Expand Down
26 changes: 26 additions & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,32 @@ src/user/user_initialization.F90
src/user/user_revise_forcing.F90
)

# CVMix
list(APPEND _files
src/parameterizations/CVmix/cvmix_background.F90
src/parameterizations/CVmix/cvmix_convection.F90
src/parameterizations/CVmix/cvmix_ddiff.F90
src/parameterizations/CVmix/cvmix_kinds_and_types.F90
src/parameterizations/CVmix/cvmix_kpp.F90
src/parameterizations/CVmix/cvmix_math.F90
src/parameterizations/CVmix/cvmix_put_get.F90
src/parameterizations/CVmix/cvmix_shear.F90
src/parameterizations/CVmix/cvmix_tidal.F90
src/parameterizations/CVmix/cvmix_utils.F90
)

# MOM6-da-hooks
list(APPEND _files
src/ocean_data_assim/core/ocean_da_core.F90
src/ocean_data_assim/core/ocean_da_types.F90
src/ocean_data_assim/core/write_ocean_obs.F90
)

# geoKdTree
list(APPEND _files
src/ocean_data_assim/geoKdTree/kdtree.f90
)

set ( src_files
${_files}
PARENT_SCOPE
Expand Down
2 changes: 1 addition & 1 deletion src/framework/MOM_horizontal_regridding.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ module MOM_horizontal_regridding

#include <MOM_memory.h>

public :: horiz_interp_and_extrap_tracer, myStats
public :: horiz_interp_and_extrap_tracer, myStats, meshgrid, fill_miss_2d

! character(len=40) :: mdl = "MOM_horizontal_regridding" ! This module's name.

Expand Down