Skip to content

Restore I/O in x3div #25

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
pbartholomew08 wants to merge 5 commits into
base: hack_DC_TGV
Choose a base branch
from
Open

Restore I/O in x3div #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
40174ea
Begin introducing IO back into x3div
pbartholomew08 Mar 7, 2022
2e2bd84
Restore I/O, now outputs but not right freq
pbartholomew08 Mar 7, 2022
30bbf36
Add calls to end_snapshot
pbartholomew08 Mar 7, 2022
3a73e68
Some changes to visu - I/O now working
pbartholomew08 Mar 7, 2022
bd3dd2a
Allow case-specific visualization
mathrack Mar 9, 2022
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
8 changes: 5 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ LDFLAGS ?= # user can set default linker flags
FFLAGS = $(FCFLAGS)
LFLAGS = $(LDFLAGS)

NTHREADS ?= 1 # gfortran requires number of threads specified at compile time...

#######CMP settings###########
ifeq ($(CMP),intel)
FC = mpiifort
Expand All @@ -38,7 +40,7 @@ else ifeq ($(CMP),gcc)
FFLAGS += -ffpe-trap=invalid,zero -fcheck=all -fimplicit-none
else
FFLAGS += -O3 -march=native
FFLAGS += -fopenmp -ftree-parallelize-loops=12
FFLAGS += -fopenmp -ftree-parallelize-loops=$(NTHREADS)
LFLAGS += -fopenmp
endif
else ifeq ($(CMP),nagfor)
Expand All @@ -59,10 +61,10 @@ DECOMPDIR = ./decomp2d
SRCDIR = ./src

### List of files for the main code
SRCDECOMP = $(DECOMPDIR)/decomp_2d.f90 $(DECOMPDIR)/glassman.f90 $(DECOMPDIR)/fft_$(FFT).f90
SRCDECOMP = $(DECOMPDIR)/decomp_2d.f90 $(DECOMPDIR)/glassman.f90 $(DECOMPDIR)/fft_$(FFT).f90 $(DECOMPDIR)/io.f90
OBJDECOMP = $(SRCDECOMP:%.f90=%.o)
OBJ = $(SRC:%.f90=%.o)
SRC = $(SRCDIR)/x3d_precision.f90 $(SRCDIR)/module_param.f90 $(SRCDIR)/time_integrators.f90 $(SRCDIR)/tools.f90 $(SRCDIR)/x3d_transpose.f90 $(SRCDIR)/var.f90 $(SRCDIR)/thomas.f90 $(SRCDIR)/x3d_operator_x_data.f90 $(SRCDIR)/x3d_operator_y_data.f90 $(SRCDIR)/x3d_operator_z_data.f90 $(SRCDIR)/x3d_operator_1d.f90 $(SRCDIR)/poisson.f90 $(SRCDIR)/x3d_derive.f90 $(SRCDIR)/x3d_staggered.f90 $(SRCDIR)/x3d_filters.f90 $(SRCDIR)/bc_tgv.f90 $(SRCDIR)/navier.f90 $(SRCDIR)/parameters.f90 $(SRCDIR)/bc_tgv2d.f90 $(SRCDIR)/case.f90 $(SRCDIR)/transeq.f90 $(SRCDIR)/x3d_tools.f90 $(SRCDIR)/xcompact3d.f90
SRC = $(SRCDIR)/x3d_precision.f90 $(SRCDIR)/module_param.f90 $(SRCDIR)/time_integrators.f90 $(SRCDIR)/tools.f90 $(SRCDIR)/x3d_transpose.f90 $(SRCDIR)/var.f90 $(SRCDIR)/thomas.f90 $(SRCDIR)/x3d_operator_x_data.f90 $(SRCDIR)/x3d_operator_y_data.f90 $(SRCDIR)/x3d_operator_z_data.f90 $(SRCDIR)/x3d_operator_1d.f90 $(SRCDIR)/poisson.f90 $(SRCDIR)/x3d_derive.f90 $(SRCDIR)/x3d_staggered.f90 $(SRCDIR)/x3d_filters.f90 $(SRCDIR)/visu.f90 $(SRCDIR)/bc_tgv.f90 $(SRCDIR)/navier.f90 $(SRCDIR)/parameters.f90 $(SRCDIR)/bc_tgv2d.f90 $(SRCDIR)/case.f90 $(SRCDIR)/transeq.f90 $(SRCDIR)/x3d_tools.f90 $(SRCDIR)/xcompact3d.f90

#######FFT settings##########
ifeq ($(FFT),fftw3)
Expand Down
1 change: 1 addition & 0 deletions decomp2d/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
file(GLOB files_decomp decomp_2d.f90
io.f90
glassman.f90)
include_directories(${CMAKE_SOURCE_DIR}/decomp2d)

Expand Down
2 changes: 2 additions & 0 deletions decomp2d/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ endif
lib_LTLIBRARIES = libdecomp2d.la
libdecomp2d_la_SOURCES = \
decomp_2d.f90 \
io.f90 \
glassman.f90 \
fft_@FFTENGINE@.f90
libdecomp2d_la_LDFLAGS = -no-undefined
Expand All @@ -18,6 +19,7 @@ endif

# Allow parallel make
glassman.lo: decomp_2d.lo
io.lo: decomp_2d.lo
if HAVE_MKL
fft_@FFTENGINE@.lo: glassman.lo mkl_dfti.lo
else
Expand Down
Loading