Skip to content

Commit

Permalink
Update default FMS to 2023.03
Browse files Browse the repository at this point in the history
The default FMS build in ac/deps is updated to 2023.03.

FMS source now includes a suite of test programs which require explicit
preprocessing macros, which can complicate out makedep-based build when
those macros are not present.  To avoid this, the new "skip" flag has
been added to the makedep build.

The skip flag should not cause errors or other issues in older versions
of FMS which do not have the excluded directory (though perhaps that
could or should change in the future).
  • Loading branch information
marshallward committed Nov 7, 2023
1 parent 4964b8b commit 715f53a
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .testing/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ MAKEFLAGS += -R
-include config.mk

# Set the infra framework
FRAMEWORK ?= fms1
FRAMEWORK ?= fms2

# Set the MPI launcher here
# TODO: This needs more automated configuration
Expand Down
2 changes: 1 addition & 1 deletion ac/deps/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ MAKEFLAGS += -R

# FMS framework
FMS_URL ?= https://github.com/NOAA-GFDL/FMS.git
FMS_COMMIT ?= 2019.01.03
FMS_COMMIT ?= 2023.03


# List of source files to link this Makefile's dependencies to model Makefiles
Expand Down
2 changes: 1 addition & 1 deletion ac/deps/Makefile.fms.in
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ ARFLAGS = @ARFLAGS@
.PHONY: depend
depend: Makefile.dep
Makefile.dep:
$(PYTHON) $(MAKEDEP) -o Makefile.dep -e -x libFMS.a @srcdir@
$(PYTHON) $(MAKEDEP) -o Makefile.dep -e -x libFMS.a -s @srcdir@/test_fms @srcdir@

0 comments on commit 715f53a

Please sign in to comment.