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

Autoconf: Ice-ocean autodetect FMS API #500

Open
wants to merge 1 commit into
base: dev/gfdl
Choose a base branch
from
Open

Autoconf: Ice-ocean autodetect FMS API #500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion coupled_AM2_LM3_SIS2/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ LM3_BUILD ?= ../shared/LM3/build
# Autoconf configuration
MOM_CODEBASE ?= ../src/MOM6
MAKEFILE_IN ?= $(MOM_CODEBASE)/ac/Makefile.in
CONFIGURE_AC ?= ../ac/configure.coupled.ac
CONFIGURE_AC ?= configure.coupled.ac
M4DIR ?= $(MOM_CODEBASE)/ac/m4
MAKEDEP ?= $(MOM_CODEBASE)/ac/makedep

Expand Down
0 ac/configure.coupled.ac → coupled_AM2_LM3_SIS2/configure.coupled.ac
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ice_ocean_SIS2/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ LAND_BUILD ?= ../shared/land_null/build
# Autoconf configuration
MOM_CODEBASE ?= ../src/MOM6
MAKEFILE_IN ?= $(MOM_CODEBASE)/ac/Makefile.in
CONFIGURE_AC ?= ../ac/configure.ice_ocean.ac
CONFIGURE_AC ?= configure.ice_ocean.ac
M4DIR ?= $(MOM_CODEBASE)/ac/m4
MAKEDEP ?= $(MOM_CODEBASE)/ac/makedep

Expand Down
8 changes: 8 additions & 0 deletions ac/configure.ice_ocean.ac → ice_ocean_SIS2/configure.ice_ocean.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,14 @@ AC_COMPILE_IFELSE(
)


# Determine the FMS IO implementation.
AX_FC_CHECK_MODULE([fms2_io_mod], [
MODEL_FRAMEWORK=${srcdir}/config_src/infra/FMS2
],[
MODEL_FRAMEWORK=${srcdir}/config_src/infra/FMS1
])


# Verify that Python is available
AC_PATH_PROGS([PYTHON], [python python3 python2], [
AC_MSG_ERROR([Could not find python.])
Expand Down
Loading