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.

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

Strip all trailing whitespace in source files #86

Merged
merged 4 commits into from Sep 10, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 10 additions & 8 deletions Makefile
Expand Up @@ -5,9 +5,11 @@ TYPE ?= hydro
include builds/make.host.$(MACHINE)
include builds/make.type.$(TYPE)

DIRS := src src/gravity src/particles src/cosmology \
src/cooling src/model src/cooling_grackle src/analysis \
src/gravity/paris
DIRS := src src/analysis src/cooling src/cooling_grackle src/cosmology \
src/cpu src/global src/gravity src/gravity/paris src/grid src/hydro \
src/integrators src/io src/main.cpp src/main.o src/model src/mpi \
src/old_cholla src/particles src/reconstruction \
src/riemann_solvers src/utils

SUFFIX ?= .$(TYPE).$(MACHINE)

Expand Down Expand Up @@ -87,8 +89,8 @@ ifeq ($(findstring -DPARALLEL_OMP,$(DFLAGS)),-DPARALLEL_OMP)
endif

ifeq ($(findstring -DLYA_STATISTICS,$(DFLAGS)),-DLYA_STATISTICS)
CXXFLAGS += -I$(FFTW_ROOT)/include
GPUFLAGS += -I$(FFTW_ROOT)/include
CXXFLAGS += -I$(FFTW_ROOT)/include
GPUFLAGS += -I$(FFTW_ROOT)/include
LIBS += -L$(FFTW_ROOT)/lib -lfftw3_mpi -lfftw3
endif

Expand Down Expand Up @@ -125,7 +127,7 @@ endif

EXEC := bin/cholla$(SUFFIX)

$(EXEC): prereq-build $(OBJS)
$(EXEC): prereq-build $(OBJS)
mkdir -p bin/ && $(LD) $(LDFLAGS) $(OBJS) -o $(EXEC) $(LIBS)
eval $(EXTRA_COMMANDS)

Expand All @@ -139,9 +141,9 @@ $(EXEC): prereq-build $(OBJS)
$(GPUCXX) $(GPUFLAGS) -c $< -o $@

.PHONY: clean

clean:
rm -f $(OBJS)
rm -f $(OBJS)
-find bin/ -type f -executable -name "cholla.*.$(MACHINE)" -exec rm -f '{}' \;

clobber: clean
Expand Down
1 change: 0 additions & 1 deletion src/.gitignore

This file was deleted.