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

Jump to bottom

Bugfix: Cray logical derived type member values #173

Merged
merged 1 commit into from
Nov 28, 2023
Merged

Bugfix: Cray logical derived type member values #173

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
11 changes: 11 additions & 0 deletions src/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,14 @@ ASSERT=-DUSE_ASSERTIONS=$(USE_ASSERTIONS)
LFLAGS=$(LINK) $(PROF) $(CAF_FLAG) $(CAF_LINK) $(LIBNETCDF) $(LIBFFT)
FFLAGS=$(COMP) $(PROF) $(CAF_FLAG) $(PREPROC) -DVERSION=\"$(GIT_VERSION)\" $(INCNETCDF) $(INCFFT) $(MODOUTPUT) $(ASSERT)

# this line is to handle the fact the Cray compiler does optimizations that
# make setting logical values in derived types unrealiable in options_obs.F90
ifeq ($(COMPILER), cray)
OPTIONS_FLAGS=${FFLAGS} -O0
else
OPTIONS_FLAGS=${FFLAGS}
endif

$(info $$NODENAME = ${NODENAME})
$(info $$FC = ${F90})
$(info $$FFTW_PATH = ${FFTW_PATH})
Expand Down Expand Up @@ -592,6 +600,9 @@ caf_threads_test: $(BUILD)test_caf_threads.o
# Generic compilation rules
###################################################################

$(BUILD)options_obj.o: $(OBJECTS)options_obj.f90
${F90} ${OPTIONS_FLAGS} $< -o $@

$(BUILD)%.o: $(UTIL)%.f90
${F90} ${FFLAGS} $< -o $@

Expand Down