Skip to content

Patch for newer FMS2 directory structure #549

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

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

Patch for newer FMS2 directory structure #549

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
4 changes: 3 additions & 1 deletion coupled_AM2_LM3_SIS2/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,9 @@ $(TESTDIR)/%/test: $(BUILD)/coupler_main
#----
# Cleanup

.PHONY: clean
.PHONY: clean clean.fms
clean.fms: clean
$(MAKE) -C ../shared/fms BUILD=$(abspath $(FMS_BUILD)) clean
clean:
$(MAKE) -C ../shared/AM2 BUILD=$(abspath $(AM2_BUILD)) clean
$(MAKE) -C ../shared/LM3 BUILD=$(abspath $(LM3_BUILD)) clean
Expand Down
10 changes: 8 additions & 2 deletions ice_ocean_SIS2/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,11 @@ EXCLUDE ?= \
EXTRA_SRC_DIRS := \
$(abspath ../src/SIS2/src) \
$(abspath ../src/SIS2/config_src/external) \
$(abspath ../src/coupler)
$(abspath $(dir $(wildcard ../src/coupler/full/ice_ocean_flux_exchange.F90)) \
$(dir $(wildcard ../src/coupler/shared/surface_flux.F90)) \
$(dir $(wildcard ../src/coupler/surface_flux.F90)) )
# The above $(or ...) covers the transition from FMS1-era to FMS2-era versions
# of the coupler. The latter has multiple versions of the main coupler.

CONFIG_FLAGS := --config-cache
CONFIG_FLAGS += --srcdir=$(abspath $(MOM_CODEBASE))
Expand Down Expand Up @@ -281,7 +285,9 @@ $(TESTDIR)/%/test: $(BUILD)/coupler_main
#----
# Cleanup

.PHONY: clean
.PHONY: clean clean.fms
clean.fms: clean
$(MAKE) -C ../shared/fms BUILD=$(abspath $(FMS_BUILD)) clean
clean:
$(MAKE) -C ../shared/atmos_null BUILD=$(abspath $(ATMOS_BUILD)) clean
$(MAKE) -C ../shared/land_null BUILD=$(abspath $(LAND_BUILD)) clean
Expand Down
4 changes: 3 additions & 1 deletion ocean_only/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,9 @@ $(TESTDIR)/%/test: $(BUILD)/MOM6
# Cleanup

# I probably need a rule in Makefile.in for all the autoconf stuff.
.PHONY: clean
.PHONY: clean clean.fms
clean.fms: clean
$(MAKE) -C ../shared/fms BUILD=$(abspath $(FMS_BUILD)) clean
clean:
rm -rf $(BUILD)

Expand Down
Loading