Skip to content

Commit ec908b7

Browse files
rfj82982rfj82982
authored
Merge pull request 2decomp-fft#160 from rfj82982/Module_cumpi
Module cumpi
2 parents 8b1c346 + 864a150 commit ec908b7

32 files changed

+455
-302
lines changed

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ CMPINC = Makefile.compilers
3939
include $(CMPINC)
4040

4141
### List of files for the main code
42-
SRCDECOMP = decomp_2d_constants.f90 factor.f90 decomp_2d.f90 log.f90 io.f90
42+
SRCDECOMP = decomp_2d_constants.f90 decomp_2d_mpi.f90 factor.f90 decomp_2d.f90 log.f90 io.f90
4343

4444
#######FFT settings##########
4545
ifeq ($(FFT),fftw3)

‎examples/fft_physical_x/fft_c2c_x.f90

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ program fft_c2c_x
33
use decomp_2d
44
use decomp_2d_fft
55
use decomp_2d_constants
6+
use decomp_2d_mpi
67
use MPI
78
#if defined(_GPU)
89
use cudafor

‎examples/fft_physical_x/fft_grid_x.f90

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ program fft_physical_x
33
use decomp_2d
44
use decomp_2d_fft
55
use decomp_2d_constants
6+
use decomp_2d_mpi
67
use MPI
78
#if defined(_GPU)
89
use cudafor

‎examples/fft_physical_x/fft_r2c_x.f90

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ program fft_r2c_x
33
use decomp_2d
44
use decomp_2d_fft
55
use decomp_2d_constants
6+
use decomp_2d_mpi
67
use MPI
78
#if defined(_GPU)
89
use cudafor

‎examples/fft_physical_z/fft_c2c_z.f90

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ program fft_c2c_z
33
use decomp_2d
44
use decomp_2d_fft
55
use decomp_2d_constants
6+
use decomp_2d_mpi
67
use MPI
78
#if defined(_GPU)
89
use cudafor

‎examples/fft_physical_z/fft_r2c_z.f90

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ program fft_r2c_z
33
use decomp_2d
44
use decomp_2d_fft
55
use decomp_2d_constants
6+
use decomp_2d_mpi
67
use MPI
78
#if defined(_GPU)
89
use cudafor

‎examples/halo_test/halo_test.f90

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ program halo_test
1010

1111
use decomp_2d
1212
use decomp_2d_constants
13+
use decomp_2d_mpi
1314
use MPI
1415
#if defined(_GPU)
1516
use cudafor

‎examples/init_test/init_test.f90

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
program init_test
66

77
use MPI
8-
use decomp_2d
98
use decomp_2d_constants
10-
use MPI
9+
use decomp_2d_mpi
10+
use decomp_2d
1111
#if defined(_GPU)
1212
use cudafor
1313
use openacc

‎examples/io_test/io_bench.f90

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
program io_bench
22

3+
use decomp_2d_constants
4+
use decomp_2d_mpi
35
use decomp_2d
46
use decomp_2d_io
57
use MPI

‎examples/io_test/io_plane_test.f90

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
program io_plane_test
88

99
use mpi
10-
10+
use decomp_2d_constants
11+
use decomp_2d_mpi
1112
use decomp_2d
1213
use decomp_2d_io
1314
#if defined(_GPU)

‎examples/io_test/io_read.f90

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
program io_read
22

33
use mpi
4-
4+
use decomp_2d_constants
5+
use decomp_2d_mpi
56
use decomp_2d
67
use decomp_2d_io
78
#if defined(_GPU)

‎examples/io_test/io_test.f90

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
program io_test
22

33
use mpi
4-
4+
use decomp_2d_constants
5+
use decomp_2d_mpi
56
use decomp_2d
67
use decomp_2d_io
78
#if defined(_GPU)

‎examples/io_test/io_var_test.f90

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
program io_var_test
55

66
use mpi
7+
use decomp_2d_constants
8+
use decomp_2d_mpi
79
use decomp_2d
810
use decomp_2d_io
911
#if defined(_GPU)

‎examples/test2d/test2d.f90

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ program test2d
33
use mpi
44
use decomp_2d
55
use decomp_2d_constants
6+
use decomp_2d_mpi
67
#if defined(_GPU)
78
use cudafor
89
use openacc

‎examples/test2d/timing2d_complex.f90

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ program timing2d_complex
33
use mpi
44
use decomp_2d
55
use decomp_2d_constants
6+
use decomp_2d_mpi
67
#if defined(_GPU)
78
use cudafor
89
use openacc

‎examples/test2d/timing2d_real.f90

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ program timing2d_real
33
use mpi
44
use decomp_2d
55
use decomp_2d_constants
6+
use decomp_2d_mpi
67
#if defined(_GPU)
78
use cudafor
89
use openacc

‎src/CMakeLists.txt

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
file(GLOB files_decomp factor.f90
22
decomp_2d_constants.f90
3+
decomp_2d_mpi.f90
34
decomp_2d.f90
45
log.f90
56
io.f90)
67
include_directories(${CMAKE_SOURCE_DIR}/src)
78

8-
#if(${FFT_Choice} MATCHES "generic")
9-
# file(GLOB files_fft fft_generic.f90)
10-
#endif(${FFT_Choice} MATCHES "generic")
9+
if(${BUILD_TARGET} MATCHES "gpu")
10+
list(APPEND files_decomp decomp_2d_cumpi.f90)
11+
endif(${BUILD_TARGET} MATCHES "gpu")
1112

1213
if(FFTW_FOUND)
1314
message (STATUS "Compiling using FFTW3")

0 commit comments

Comments
 (0)