Skip to content

GYRE 9.1 #1016

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
rhdtownsend wants to merge 14 commits into
base: main
Choose a base branch
from
Open

GYRE 9.1 #1016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
c673e9b
Changed handling of math slots to work with SDK 26.2.2 approach of ad…
rhdtownsend Feb 11, 2026
ddf40d2
Added blas to EXTERNAL_DEPENDS_ON
rhdtownsend Feb 11, 2026
b3c9720
mtx: fix undefined behaviour in `b` pivot swaps
VincentVanlaer Feb 12, 2026
d099bcc
Merge branch 'new-sdk' into forum-1.2
rhdtownsend Feb 19, 2026
c649882
Switched to forum-HEAD (2026/2/19)
rhdtownsend Feb 19, 2026
8e1d5a4
Initial chages to prepare for update to gyre-9.0
rhdtownsend Feb 20, 2026
8944cb0
Changed to ForUM 1.2.1
rhdtownsend Mar 6, 2026
7550366
Tweaked pkgconfig invocation to align with latest SDK
rhdtownsend Mar 6, 2026
addc58b
Added missing flags for pkgconfig
rhdtownsend Mar 6, 2026
b8f9d43
Merge branch 'new-sdk' into forum-1.2
rhdtownsend Mar 6, 2026
704d368
Updated to ForUM 1.2.2
rhdtownsend Mar 6, 2026
fcda791
Merge branch 'forum-1.2' into gyre-9
rhdtownsend Mar 6, 2026
7249ecc
Updated GYRE to 9.1 release
rhdtownsend May 26, 2026
e2fef01
Bumped to forum 1.2.3, which includes the -ftrampoline-impl=heap buil…
rhdtownsend Apr 2, 2026
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: 2 additions & 2 deletions forum/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ endif
BUILD_DIR_FORUM_BUILD := $(BUILD_DIR_MODULE)/src
INSTALL_INCLUDES_BUILD += $(BUILD_DIR_MODULE)/include/forum.inc

$(BUILD_DIR_FORUM_BUILD): forum-1.0.4.tar.gz | $(BUILD_DIR_FORUM_BUILD)/. $(BUILD_DIR_MODULE)/include/.
$(BUILD_DIR_FORUM_BUILD): forum-1.2.3.tar.gz | $(BUILD_DIR_FORUM_BUILD)/. $(BUILD_DIR_MODULE)/include/.
tar --strip-components=1 -xf $< -C $(BUILD_DIR_FORUM_BUILD)
cp $(BUILD_DIR_FORUM_BUILD)/src/include/forum.inc $(BUILD_DIR_MODULE)/include/forum.inc

$(BUILD_DIR_FORUM_BUILD)/build-complete: $(BUILD_DIR_FORUM_BUILD)
$(MAKE) -C $(BUILD_DIR_FORUM_BUILD) SHARED=$(DYNAMIC) DEBUG=$(FORUM_DEBUG) OMP=$(WITH_OPENMP) FPE=no VERSION_CHECK=passed FPP="$(FPP)" LDFLAGS="$(LIB_DEP_ARGS)" FFLAGS="$(_FFLAGS) -std=f2018"
$(MAKE) -C $(BUILD_DIR_FORUM_BUILD) SHARED=$(DYNAMIC) DEBUG=$(FORUM_DEBUG) OMP=$(WITH_OPENMP) FPE=no VERSION_CHECK=passed FPP="$(FPP)"
touch $@

$(OBJ_OUT): $(BUILD_DIR_FORUM_BUILD)/build-complete | $(BUILD_DIR_MODULE)/lib/.
Expand Down
3 changes: 0 additions & 3 deletions forum/forum-1.0.4.tar.gz
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions forum/forum-1.2.3.tar.gz
View file
Open in desktop
Git LFS file not shown
13 changes: 4 additions & 9 deletions gyre/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ifeq ($(WITH_GYRE),yes)
SRCS :=
SRCS_CHECK := test/src/test_gyre.f90
INTERNAL_DEPENDS_ON := forum const
EXTERNAL_DEPENDS_ON := hdf5_fortran lapack95 lapack
EXTERNAL_DEPENDS_ON := hdf5_fortran lapack95 lapack blas
CHECK_RESULTS_GOLDEN := test/test_output
CHECK_DIFF_PROG := ndiff -quiet -relerr 1.0e-6
BINTYPE := lib
Expand Down Expand Up @@ -43,19 +43,14 @@ else
GYRE_DEBUG = false
endif

ifeq ($(MESASDK_ROOT),)
FPP=./fypp_deps $(FLAGS_DEPS)
else
FPP= PYTHONPATH=$(MESASDK_ROOT)/lib/python ./fypp_deps $(FLAGS_DEPS)
endif

BUILD_DIR_GYRE_BUILD := $(BUILD_DIR_MODULE)/src

$(BUILD_DIR_GYRE_BUILD): gyre-8.1.tar.gz | $(BUILD_DIR_GYRE_BUILD)/. $(BUILD_DIR_MODULE)/include/.
$(BUILD_DIR_GYRE_BUILD): gyre-9.1.tar.gz | $(BUILD_DIR_GYRE_BUILD)/. $(BUILD_DIR_MODULE)/include/.
tar --strip-components=1 -xf $< -C $(BUILD_DIR_GYRE_BUILD)

$(BUILD_DIR_GYRE_BUILD)/build-complete: $(BUILD_DIR_GYRE_BUILD)
$(MAKE) -C $(BUILD_DIR_GYRE_BUILD) SHARED=$(DYNAMIC) DEBUG=$(GYRE_DEBUG) OMP=$(WITH_OPENMP) CRMATH=$(WITH_CRLIBM) VERSION_CHECK=passed FPP="$(FPP)" LDFLAGS="$(LIB_DEP_ARGS)" FFLAGS="$(_FFLAGS) -std=f2018" FRONTENDS=no TOOLS=no FORUM=no IFACES=yes
$(MAKE) -C $(BUILD_DIR_GYRE_BUILD) SHARED=$(DYNAMIC) DEBUG=$(GYRE_DEBUG) OMP=$(WITH_OPENMP) \
CRMATH=$(WITH_CRLIBM) FRONTENDS=no TOOLS=no EXTERNAL_FORUM=yes EXTERNAL_FORUM_PKG=mesa-forum IFACES=yes
touch $@


Expand Down
3 changes: 0 additions & 3 deletions gyre/gyre-8.1.tar.gz
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions gyre/gyre-9.1.tar.gz
View file
Open in desktop
Git LFS file not shown
7 changes: 2 additions & 5 deletions make/setup-depends.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,10 @@ PKG_CONFIG_FLAGS =

ifneq ($(MESASDK_ROOT),)
ifeq ($(WITH_CRLIBM),yes)
PKG_CONFIG_FLAGS += --define-variable=MATH_SLOT=crmath
MESASDK_MATH_SLOT = crmath
PKG_CONFIG_FLAGS += --define-variable=math_slot=crmath
else
PKG_CONFIG_FLAGS += --define-variable=MATH_SLOT=default
MESASDK_MATH_SLOT = default
PKG_CONFIG_FLAGS += --define-variable=math_slot=default
endif
export MESASDK_MATH_SLOT
endif

PKG_CONFIG_PATH := $(shell BUILD_DIR=$(BUILD_DIR_) $(MAKE_DIR)/gen-pkgconfig-path $(SUBDIRS)):$(PKG_CONFIG_PATH)
Expand Down
2 changes: 1 addition & 1 deletion mtx/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ SRCS_CHECK := test/src/test_mtx.f90 \
test/src/test_block_tridiagonal.f90
# TODO: Also contains test dependencies sadly, I should fix this at some point
INTERNAL_DEPENDS_ON := const utils math
EXTERNAL_DEPENDS_ON := lapack
EXTERNAL_DEPENDS_ON := lapack blas
BINTYPE := lib

# Testing
Expand Down
Loading