Skip to content

Explicitly define external directory of SIS2 #571

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

Merged
adcroft merged 2 commits into from
Dec 22, 2025
Merged

Explicitly define external directory of SIS2 #571

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ca0774
Explicitly define external directory of SIS2
marshallward Dec 17, 2025
39d05bd
Merge branch 'dev/gfdl' into sis2-explicit-externals
marshallward Dec 22, 2025
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 @@ -37,7 +37,7 @@ EXCLUDE ?= \
# Autoconf setup
EXTRA_SRC_DIRS = \
$(abspath ../src/SIS2/src) \
$(abspath ../src/SIS2/config_src/external) \
$(abspath ../src/SIS2/config_src/external/Icepack_interfaces) \
$(abspath ../src/coupler)

CONFIG_FLAGS := --config-cache
Expand Down
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 @@ -38,7 +38,7 @@ EXCLUDE ?= \
# Autoconf setup
EXTRA_SRC_DIRS := \
$(abspath ../src/SIS2/src) \
$(abspath ../src/SIS2/config_src/external) \
$(abspath ../src/SIS2/config_src/external/Icepack_interfaces) \
$(abspath ../src/coupler)

CONFIG_FLAGS := --config-cache
Expand Down
28 changes: 24 additions & 4 deletions tools/MRS/Makefile.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,10 +186,30 @@ $(eval $(call compile,,MOM6,$$(ENV_SCRIPT),))
# Generate lists of variables and dependencies for SIS2 libraries
# $(1) = compiler, $(2) = mode, $(3) = memory style, $(4) = mom6 configuration
define sis2-variables
$(BUILD)/$(1)/$(2)/dynamic_nonsymmetric/$(4)/path_names: $(SIS2_SRC)/config_src/dynamic/* $(SIS2_SRC)/config_src/external/* $(SIS2_SRC)/src/* $(MOM6_SRC)/src/framework/MOM_memory_macros.h
$(BUILD)/$(1)/$(2)/dynamic_nonsymmetric/$(4)/path_names: LIST_PATHS_ARGS = $(SIS2_SRC)/config_src/dynamic/ $(SIS2_SRC)/config_src/external/* $(SIS2_SRC)/src/ $(MOM6_SRC)/src/framework/MOM_memory_macros.h
$(BUILD)/$(1)/$(2)/dynamic_symmetric/$(4)/path_names: $(SIS2_SRC)/config_src/dynamic_symmetric/* $(SIS2_SRC)/config_src/external/* $(SIS2_SRC)/src/* $(MOM6_SRC)/src/framework/MOM_memory_macros.h
$(BUILD)/$(1)/$(2)/dynamic_symmetric/$(4)/path_names: LIST_PATHS_ARGS = $(SIS2_SRC)/config_src/dynamic_symmetric/ $(SIS2_SRC)/config_src/external/* $(SIS2_SRC)/src/ $(MOM6_SRC)/src/framework/MOM_memory_macros.h
$(BUILD)/$(1)/$(2)/dynamic_nonsymmetric/$(4)/path_names: \
$(SIS2_SRC)/config_src/dynamic/* \
$(SIS2_SRC)/config_src/external/Icepack_interfaces/* \
$(SIS2_SRC)/src/* \
$(MOM6_SRC)/src/framework/MOM_memory_macros.h

$(BUILD)/$(1)/$(2)/dynamic_nonsymmetric/$(4)/path_names: \
LIST_PATHS_ARGS = $(SIS2_SRC)/config_src/dynamic/ \
$(SIS2_SRC)/config_src/external/Icepack_interfaces/ \
$(SIS2_SRC)/src/ \
$(MOM6_SRC)/src/framework/MOM_memory_macros.h

$(BUILD)/$(1)/$(2)/dynamic_symmetric/$(4)/path_names: \
$(SIS2_SRC)/config_src/dynamic_symmetric/* \
$(SIS2_SRC)/config_src/external/Icepack_interfaces/* \
$(SIS2_SRC)/src/* \
$(MOM6_SRC)/src/framework/MOM_memory_macros.h

$(BUILD)/$(1)/$(2)/dynamic_symmetric/$(4)/path_names: \
LIST_PATHS_ARGS = $(SIS2_SRC)/config_src/dynamic_symmetric/ \
$(SIS2_SRC)/config_src/external/Icepack_interfaces/ \
$(SIS2_SRC)/src/ \
$(MOM6_SRC)/src/framework/MOM_memory_macros.h

$(BUILD)/$(1)/$(2)/$(3)/$(4)/Makefile: CPP_DEFS = -D_FILE_VERSION="`$(GIT_VERSION_SCRIPT) $$$$<`" -DSTATSLABEL=\"$(STATS_PLATFORM)$(1)$(STATS_COMPILER_VER)\"
$(BUILD)/$(1)/$(2)/$(3)/$(4)/libsis2.a: $(BUILD)/$(1)/$(2)/icebergs/libicebergs.a $(BUILD)/$(1)/$(2)/ice_param/libice_param.a
.SECONDARY: $(BUILD)/$(1)/$(2)/$(3)/$(4)/path_names
Expand Down